Merge branch 'backport' into work

[chaz/openbox] / .gitignore

diff --git a/.gitignore b/.gitignore
index 3f68a41191af3f8468a065ecda14f3a0b90ecf8f..fa2b39043144cb05261c0a4fc8e412c49b9cc7a1 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -51,6 +51,8 @@ po/remove-potcdate.sed
 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
@@ -71,6 +73,7 @@ tests/grouptran
 tests/grouptran2
 tests/grouptrancircular
 tests/grouptrancircular2
+tests/iconifydelay
 tests/icons
 tests/mapiconic
 tests/modal
@@ -91,3 +94,4 @@ tests/title
 tests/urgent
 tests/usertimewin
 data/autostart.sh
+<+