diff options
| author | Dana Jansens <danakj@orodu.net> | 2008-01-31 12:36:06 -0500 |
|---|---|---|
| committer | Dana Jansens <danakj@orodu.net> | 2008-01-31 12:51:38 -0500 |
| commit | 20b8fcfa33feeade5946bc7f3046705da5d164fe (patch) | |
| tree | 5199d13a9f18aa90ce51244c3c3eb6685d7673ab /.gitignore | |
| parent | dc94a241c30484611688a8bfb5515577f017529e (diff) | |
| parent | d11ac82062d729be5d63c9c40c5c2bb312a8b8f1 (diff) | |
Merge branch 'backport' into work
Conflicts:
openbox/client.c
openbox/config.c
openbox/event.c
openbox/extensions.c
openbox/focus_cycle_indicator.c
openbox/focus_cycle_popup.c
openbox/menuframe.c
openbox/moveresize.c
openbox/openbox.c
openbox/screen.c
openbox/stacking.c
openbox/startupnotify.c
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 39 |
1 files changed, 39 insertions, 0 deletions
@@ -44,6 +44,9 @@ 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-4.0.pc obt/obt-4.0.pc @@ -51,3 +54,39 @@ 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 |