Merge branch 'backport' into work
authorMikael Magnusson <mikachu@comhem.se>
Sat, 8 Mar 2008 16:43:32 +0000 (17:43 +0100)
committerMikael Magnusson <mikachu@comhem.se>
Sat, 8 Mar 2008 16:43:32 +0000 (17:43 +0100)
commitec328fc04fe6e8d8c3d1ee386d4964963eb2ee17
treec91070084eee7915dd29453076dc7f30b5b97fa0
parentcfe36a0df2db3e5fd4c52e32093ea095492297cf
parentc716d1788bb4f4b9db403617023f06347ba48102
Merge branch 'backport' into work

Conflicts:

obt/keyboard.c
openbox/actions/cyclewindows.c
openbox/actions/directionalwindows.c
openbox/frame.c
openbox/openbox.c
17 files changed:
openbox/actions.c
openbox/actions/cyclewindows.c
openbox/actions/desktop.c
openbox/actions/directionalwindows.c
openbox/client.c
openbox/config.h
openbox/event.c
openbox/focus.c
openbox/focus_cycle.c
openbox/frame.c
openbox/keyboard.c
openbox/menu.c
openbox/menuframe.c
openbox/moveresize.c
openbox/prompt.c
openbox/session.c
render/theme.c