Merge branch 'backport' into 3.4
authorMikael Magnusson <mikachu@comhem.se>
Thu, 28 Feb 2008 00:31:32 +0000 (01:31 +0100)
committerMikael Magnusson <mikachu@comhem.se>
Thu, 28 Feb 2008 00:31:32 +0000 (01:31 +0100)
commitad0c5b92577571ef7ecec5e89ee2611928cf2238
tree1efe32ae6b0336d80c0aa64644732b48bc157621
parent87ceac57c96556333727d64653e3e3891bad5ba8
parente35a4697a76dc520d582dad242e578a617d0bdfe
Merge branch 'backport' into 3.4

Conflicts:

openbox/event.h
openbox/event.h
openbox/mouse.c