Merge branch 'backport' into work
authorMikael Magnusson <mikachu@gmail.com>
Wed, 29 Oct 2008 12:48:03 +0000 (13:48 +0100)
committerMikael Magnusson <mikachu@gmail.com>
Wed, 29 Oct 2008 12:48:34 +0000 (13:48 +0100)
commitc230443c6596039f426542f5a286120891a745c5
tree453807056a3f985b4b51d372c5b8d31f84b994a2
parente6fea245756b59f83dc0f51d13feee9cf093a1a1
parent6a35e7c594959ee17392aec76ba074565a63ea57
Merge branch 'backport' into work
openbox/actions/desktop.c
openbox/client.c