]> icculus.org git repositories - mikachu/openbox.git/commit
Merge branch 'backport' into work
authorMikael Magnusson <mikachu@comhem.se>
Sat, 8 Mar 2008 15:51:19 +0000 (16:51 +0100)
committerMikael Magnusson <mikachu@comhem.se>
Sat, 8 Mar 2008 15:52:06 +0000 (16:52 +0100)
commite545ad3481091c635cb8c9da49cc49bbc6eb987b
treede9a679a9bfb6d4ab3b7a9506da03f0596665734
parentecdffbf735c975918ec5a6cc409571674c5a4db6
parent5c6d3d2da70588396ff99c8d66c693e689468788
Merge branch 'backport' into work

Conflicts:

obt/keyboard.c
openbox/actions/cyclewindows.c
openbox/actions/directionalwindows.c
openbox/frame.c
openbox/openbox.c
20 files changed:
obt/util.h
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/resist.c
openbox/session.c
render/image.c
render/theme.c