Merge branch 'work' into wip/mikabox
authorMikael Magnusson <mikachu@gmail.com>
Wed, 29 Oct 2008 12:50:50 +0000 (13:50 +0100)
committerMikael Magnusson <mikachu@gmail.com>
Wed, 29 Oct 2008 12:50:50 +0000 (13:50 +0100)
commita8eff8977567918068131d4e30e17d17dc55591c
tree62e6bafb563b9147e51c89cb2f571eb408494a1a
parentd908603918630b0498c31921077ce8418a970ec7
parentc230443c6596039f426542f5a286120891a745c5
Merge branch 'work' into wip/mikabox

Conflicts:
openbox/event.c
data/rc.xml
obt/prop.c
obt/prop.h
openbox/actions/desktop.c
openbox/client.c
openbox/event.c