Merge branch 'backport' into work

[chaz/openbox] / .gitignore

diff --git a/.gitignore b/.gitignore
index 3baae1438b16b13785bf0bea7382c9c7fabdf0d5..f4b627b5b5bacbbe3036931c4ddca285d505d0b9 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -32,7 +32,7 @@ m4/*.m4
 missing
 .dirstamp
 openbox/openbox
-parser/obparser-3.0.pc
+parser/obparser-4.0.pc
 po/Makefile.in.in
 po/Makevars.template
 po/POTFILES
@@ -48,8 +48,11 @@ po/en@boldquot.insert-header
 po/en@quot.insert-header
 po/remove-potcdate.sed
 *.gmo
-render/obrender-3.0.pc
+obrender/obrender-3.5.pc
+obt/obt-3.5.pc
 tools/gnome-panel-control/gnome-panel-control
+tools/gdm-control/gdm-control
+tools/obxprop/obxprop
 version.h
 .libs
 .deps
@@ -70,13 +73,16 @@ tests/grouptran
 tests/grouptran2
 tests/grouptrancircular
 tests/grouptrancircular2
+tests/iconifydelay
 tests/icons
 tests/mapiconic
+tests/mingrow
 tests/modal
 tests/modal2
 tests/modal3
 tests/noresize
 tests/override
+tests/overrideinputonly
 tests/positioned
 tests/resize
 tests/restack
@@ -89,3 +95,5 @@ tests/strut
 tests/title
 tests/urgent
 tests/usertimewin
+data/autostart.sh
+<+