Merge branch 'backport' into work
authorMikael Magnusson <mikachu@gmail.com>
Thu, 29 Jan 2009 21:45:47 +0000 (22:45 +0100)
committerMikael Magnusson <mikachu@gmail.com>
Thu, 29 Jan 2009 21:45:47 +0000 (22:45 +0100)
commit4145468a1984e1055a947ad957075ae51f70ca9c
tree923b1d6ae11d4ba0c471779229d2f76642bf4774
parent90cecafa3de2f118e550622932d1d30266c71226
parentd0829d4416d83fda4aa4ec8d5f0a7003b0a7f148
Merge branch 'backport' into work

Conflicts:
openbox/event.c
openbox/frame.c
openbox/client.h
openbox/event.c
openbox/frame.c