Merge branch 'backport' into work

[chaz/openbox] / .gitignore

diff --git a/.gitignore b/.gitignore
index 3ea0363d4e6077536d8a57d3f5581e2ba1a0f9dd..3e0eac02e5b4a233637f5b721b108d36494c98e7 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -22,6 +22,7 @@ doc/openbox-gnome-session.1
 doc/openbox-kde-session.1
 doc/openbox-session.1
 doc/openbox.1
+doc/obxprop.1
 libtool
 ltmain.sh
 m4/*.m4
@@ -32,7 +33,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,10 +49,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/obprop/obprop
+tools/obxprop/obxprop
 version.h
 .libs
 .deps
@@ -72,13 +74,17 @@ 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/oldfullscreen
 tests/override
+tests/overrideinputonly
 tests/positioned
 tests/resize
 tests/restack