Merge branch 'backport' into work

[dana/openbox.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 9265470..3f68a41 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
@@ -44,9 +44,50 @@ po/insert-header.sin
 po/quot.sed
 po/remove-potcdate.sin
 po/stamp-po
+po/en@boldquot.insert-header
+po/en@quot.insert-header
+po/remove-potcdate.sed
 *.gmo
-render/obrender-3.0.pc
+render/obrender-4.0.pc
+obt/obt-4.0.pc
 tools/gnome-panel-control/gnome-panel-control
 version.h
 .libs
 .deps
+tests/aspect
+tests/big
+tests/borderchange
+tests/confignotify
+tests/confignotifymax
+tests/duplicatesession
+tests/extentsrequest
+tests/fakeunmap
+tests/fallback
+tests/focusout
+tests/fullscreen
+tests/grav
+tests/groupmodal
+tests/grouptran
+tests/grouptran2
+tests/grouptrancircular
+tests/grouptrancircular2
+tests/icons
+tests/mapiconic
+tests/modal
+tests/modal2
+tests/modal3
+tests/noresize
+tests/override
+tests/positioned
+tests/resize
+tests/restack
+tests/shape
+tests/showhide
+tests/skiptaskbar
+tests/skiptaskbar2
+tests/stacking
+tests/strut
+tests/title
+tests/urgent
+tests/usertimewin
+data/autostart.sh