Merge branch 'backport' into work

[dana/openbox.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index bac98c7..3e0eac0 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -33,7 +33,7 @@ m4/*.m4
 missing
 .dirstamp
 openbox/openbox
 missing
 .dirstamp
 openbox/openbox

-parser/obparser-3.0.pc
+parser/obparser-4.0.pc

 po/Makefile.in.in
 po/Makevars.template
 po/POTFILES
 po/Makefile.in.in
 po/Makevars.template
 po/POTFILES


@@ -49,7 +49,8 @@ po/en@boldquot.insert-header
 po/en@quot.insert-header
 po/remove-potcdate.sed
 *.gmo
 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
 tools/gnome-panel-control/gnome-panel-control
 tools/gdm-control/gdm-control
 tools/obxprop/obxprop


@@ -76,11 +77,14 @@ tests/grouptrancircular2
 tests/iconifydelay
 tests/icons
 tests/mapiconic
 tests/iconifydelay
 tests/icons
 tests/mapiconic

+tests/mingrow

 tests/modal
 tests/modal2
 tests/modal3
 tests/noresize
 tests/modal
 tests/modal2
 tests/modal3
 tests/noresize

+tests/oldfullscreen

 tests/override
 tests/override

+tests/overrideinputonly

 tests/positioned
 tests/resize
 tests/restack
 tests/positioned
 tests/resize
 tests/restack