]> icculus.org git repositories - mikachu/openbox.git/commit
Merge branch 'backport' into work
authorDana Jansens <danakj@orodu.net>
Sat, 21 Nov 2009 21:56:07 +0000 (16:56 -0500)
committerDana Jansens <danakj@orodu.net>
Sat, 21 Nov 2009 21:56:07 +0000 (16:56 -0500)
commit4bf6b1b551be744be4fbe4d1faab5be12d051378
treea17c1404021df31757bc53fe35914182f389c1e1
parentc02c825cb8f18f0170b312ea8d4b3f4d491bff40
parentada5de28f71efaa5584709673cc49cdb3b703299
Merge branch 'backport' into work

Conflicts:
openbox/popup.c
openbox/actions/moveresizeto.c
openbox/client.c
openbox/frame.c
openbox/popup.c
openbox/screen.c
render/theme.c