diff options
| author | Dana Jansens <danakj@orodu.net> | 2008-03-06 02:46:32 -0500 |
|---|---|---|
| committer | Dana Jansens <danakj@orodu.net> | 2008-03-06 02:46:32 -0500 |
| commit | 18141d78dab9e19161cae3e7e89f8b95591a2e9b (patch) | |
| tree | 326d328ded5628ced985a84b8546e9362909c732 /.gitignore | |
| parent | 40377ab10a5970b20ab005a3d4994dfdf244cd4c (diff) | |
| parent | ae0971659fdd41fc7e9ccb6ca2b2536f96c09061 (diff) | |
Merge branch 'backport' into work
Conflicts:
openbox/client.c
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -51,6 +51,7 @@ po/remove-potcdate.sed render/obrender-4.0.pc obt/obt-4.0.pc tools/gnome-panel-control/gnome-panel-control +tools/gdm-control/gdm-control version.h .libs .deps @@ -91,3 +92,4 @@ tests/title tests/urgent tests/usertimewin data/autostart.sh +<+ |