Merge branch 'work' into wip/mikabox
authorMikael Magnusson <mikachu@gmail.com>
Mon, 2 Feb 2009 14:43:49 +0000 (15:43 +0100)
committerMikael Magnusson <mikachu@gmail.com>
Mon, 2 Feb 2009 14:43:49 +0000 (15:43 +0100)
commitc422b8a11557400a4514b5d1cf66e7f8ab029d2e
tree443832a3bb2ee6d51f1140dce7f7b433ca4c7691
parentf28e77e336b6f90f1e15388aa933f6aacc2a67c2
parent4145468a1984e1055a947ad957075ae51f70ca9c
Merge branch 'work' into wip/mikabox

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