Commit graph

8 commits

Author SHA1 Message Date
Dana Jansens
20b8fcfa33 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
2008-01-31 12:51:38 -05:00
Dana Jansens
de2d970ce1 ignore the built tests and some extra po/ generated junk 2008-01-27 04:25:09 -05:00
Dana Jansens
275fdf8c2a ignore the new 4.0 pkgconfig files 2008-01-20 01:36:55 -05:00
Dana Jansens
ee8d27a6e8 ignore .libs and .deps dirs 2007-07-19 14:15:33 -04:00
Dana Jansens
1215fbee40 add TAGS to .gitignore 2007-07-17 12:11:38 -04:00
Dana Jansens
27a0f0f4c9 split the focustobottom action back out from unfocus 2007-07-14 09:17:39 -04:00
Mikael Magnusson
bc2c2bc3f0 make .gitignore more sane 2007-07-14 01:14:30 +02:00
Dana Jansens
831c27e82c add the .gitignore file and update the po files
Signed-off-by: Dana Jansens <danakj@orodu.net>
2007-07-12 03:22:09 -04:00