Merge branch 'work' into wip/mikabox
authorMikael Magnusson <mikachu@gmail.com>
Wed, 5 Nov 2008 18:36:16 +0000 (19:36 +0100)
committerMikael Magnusson <mikachu@gmail.com>
Wed, 5 Nov 2008 18:36:16 +0000 (19:36 +0100)
commit50de54cbf206c299252409e7fd50810ccaff8337
treeb41d0af26f72d86fbf76006cac0da87c2a52dd77
parentb5f4560c6512b3a63b2ac6935008adbb9cc86891
parent98e9afcef1cb0031a058f172570dff866b897b55
Merge branch 'work' into wip/mikabox

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