Merge branch 'backport' into work
authorDana Jansens <danakj@orodu.net>
Wed, 16 Dec 2009 20:39:25 +0000 (15:39 -0500)
committerDana Jansens <danakj@orodu.net>
Wed, 16 Dec 2009 20:39:25 +0000 (15:39 -0500)
commit50d662681160c309ea86268c0d05794b87b75593
treef8ee31f3becc85527581072f9ab1ee6486f62465
parenta93b00a5e93281c7c2c31112f0b6b827d605a19d
parent8ada991d829671ab5e6dd4c5526b6a0238ba6a16
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
16 files changed:
obt/keyboard.c
obt/keyboard.h
openbox/actions/cyclewindows.c
openbox/actions/directionalwindows.c
openbox/event.c
openbox/focus_cycle_popup.c
openbox/keyboard.c
openbox/menuframe.c
openbox/menuframe.h
openbox/moveresize.c
openbox/openbox.c
openbox/openbox.h
openbox/prompt.c
openbox/screen.c
openbox/screen.h
render/image.c