Merge branch 'backport' into work
authorDana Jansens <danakj@orodu.net>
Sat, 12 Dec 2009 00:02:11 +0000 (19:02 -0500)
committerDana Jansens <danakj@orodu.net>
Sat, 12 Dec 2009 00:02:11 +0000 (19:02 -0500)
commitacafa38c8ea210b12ed92fc16281b915ab61542c
treece4c7d2a4a9b3478a4d48af2c54ada06593ed022
parent2f09e0ce388f63c341cb328d795766e2bd0dc24b
parent9ba2b04e96449fea5b6bd212aa3d431638754bdd
Merge branch 'backport' into work

Conflicts:
openbox/config.c
openbox/event.c
openbox/prop.c
openbox/prop.h
openbox/screen.c
openbox/screen.h
23 files changed:
Makefile.am
data/rc.xml
obt/prop.c
obt/prop.h
openbox/actions/focus.c
openbox/client.c
openbox/client.h
openbox/config.c
openbox/config.h
openbox/event.c
openbox/focus.c
openbox/focus.h
openbox/focus_cycle.c
openbox/focus_cycle_popup.c
openbox/frame.c
openbox/keyboard.c
openbox/openbox.c
openbox/place.c
openbox/screen.c
openbox/screen.h
openbox/stacking.c
po/POTFILES.in
render/image.c