Merge branch 'backport' into work

[chaz/openbox] / .gitignore

diff --git a/.gitignore b/.gitignore
index 9e6bcb6b4d2d19443cdb9823bf528ad1ef4a2239..bc20413dc270d1d49dd4c765a7d8635595041f58 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -52,6 +52,7 @@ render/obrender-4.0.pc
 obt/obt-4.0.pc
 tools/gnome-panel-control/gnome-panel-control
 tools/gdm-control/gdm-control
+tools/obprop/obprop
 version.h
 .libs
 .deps