Merge branch 'backport' into wip/mikabox
authorMikael Magnusson <mikachu@gmail.com>
Sat, 4 Jul 2009 15:50:05 +0000 (17:50 +0200)
committerMikael Magnusson <mikachu@gmail.com>
Sat, 4 Jul 2009 15:50:05 +0000 (17:50 +0200)
commit05f5876d6564135f32aaed4e314bd326c1a1eba9
tree58c70c2255a87cbe4a46525cab2fc7c89feeded3
parent8f4b12123ba531dd55c8f0b1d75ce501c7cd512d
parent2e1adce628ee3234accc5d88cafb57672800cae0
Merge branch 'backport' into wip/mikabox

Conflicts:
openbox/actions/desktop.c
openbox/client.c
openbox/popup.c
openbox/screen.c
data/rc.xsd
openbox/actions/desktop.c
openbox/actions/moveresizeto.c
openbox/client.c
openbox/popup.c
openbox/screen.c
render/theme.c