Merge branch 'mikabox/actions' into wip/mikabox
authorMikael Magnusson <mikachu@comhem.se>
Sat, 8 Mar 2008 17:36:47 +0000 (18:36 +0100)
committerMikael Magnusson <mikachu@comhem.se>
Sat, 8 Mar 2008 17:36:47 +0000 (18:36 +0100)
commitbf84522ae59efabab6ea3f85e7331626df34d8a1
treeab43dd4e696b47302755aef38d841104b4c3dd25
parentbadf4e55f2b8784f064be660f4aae9a8eeac4d01
parentbec982e40dfb7e2af0d0046df02a757672fe00f7
Merge branch 'mikabox/actions' into wip/mikabox

Conflicts:

openbox/actions/all.c
openbox/actions/all.c