openbox/obt
Dana Jansens 50d6626811 Merge branch 'backport' into work
Conflicts:

	obt/keyboard.c
	obt/keyboard.h
	openbox/event.c
	openbox/menuframe.c
	openbox/moveresize.c
	openbox/openbox.c
	openbox/screen.c
2009-12-16 15:39:25 -05:00
..
display.c
display.h
internal.h
keyboard.c
keyboard.h
mainloop.c
mainloop.h
Makefile
obt-4.0.pc.in
parse.c
parse.h
paths.c
paths.h
prop.c
prop.h
util.h
version.h.in
xevent.c
xevent.h