Merge branch 'backport' into work

[chaz/openbox] / .gitignore

diff --git a/.gitignore b/.gitignore
index 92481bc3a3743d21c4cf52b345db9a94536ef3e9..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
@@ -76,11 +77,14 @@ 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