Merge branch 'backport' into work
authorDana Jansens <danakj@orodu.net>
Fri, 22 Feb 2008 17:31:26 +0000 (12:31 -0500)
committerDana Jansens <danakj@orodu.net>
Fri, 22 Feb 2008 17:31:26 +0000 (12:31 -0500)
commit97de73776708d7c75b42c8fcf33342541d721c83
treeffeaae16ca8c9e248062cb04a3266964735c4488
parent198d98986bdf224ed29361541d19841339953088
parentd9e6aa5643e74ab84fde0ddb1fcb8418ff212281
Merge branch 'backport' into work

Conflicts:

openbox/menuframe.c
openbox/prompt.c
openbox/prop.c
openbox/prop.h
obt/prop.c
obt/prop.h
openbox/client.c
openbox/menuframe.c
openbox/prompt.c
openbox/prompt.h
render/theme.c
render/theme.h