Merge branch 'backport' into work
authorDana Jansens <danakj@orodu.net>
Mon, 11 Jan 2010 21:20:53 +0000 (16:20 -0500)
committerDana Jansens <danakj@orodu.net>
Mon, 11 Jan 2010 21:20:53 +0000 (16:20 -0500)
commit567fd15eebdd44e50cef140419dbf7a336708109
tree3b3691719c704d6da4454bd78e17ec8b495ee76a
parent3e9dbc01430193035e3d1f5832c019c3f9623db8
parente8200ae603f33b70824c125ba6b37bfaec7d89ea
Merge branch 'backport' into work

Conflicts:

configure.ac
data/rc.xml
openbox/client.c
openbox/event.c
openbox/focus_cycle.c
openbox/focus_cycle_popup.c
openbox/openbox.c
openbox/prop.c
openbox/prop.h
openbox/screen.c
parser/parse.c
version.h.in
18 files changed:
configure.ac
data/rc.xml
obt/prop.c
obt/prop.h
openbox/client.c
openbox/client.h
openbox/event.c
openbox/focus.c
openbox/focus.h
openbox/focus_cycle.c
openbox/focus_cycle.h
openbox/focus_cycle_popup.c
openbox/focus_cycle_popup.h
openbox/menuframe.c
openbox/menuframe.h
openbox/openbox.c
openbox/screen.c
version.h.in