]> icculus.org git repositories - mikachu/openbox.git/commit
Merge branch 'work' into wip/mikabox
authorMikael Magnusson <mikachu@comhem.se>
Sun, 9 Mar 2008 17:53:11 +0000 (18:53 +0100)
committerMikael Magnusson <mikachu@comhem.se>
Sun, 9 Mar 2008 17:53:11 +0000 (18:53 +0100)
commit8843a2311891a9fd9accb4be47f610606ca9e477
tree86454b738be789bd484dd17c2d8f8983c5200293
parentbf84522ae59efabab6ea3f85e7331626df34d8a1
parentec328fc04fe6e8d8c3d1ee386d4964963eb2ee17
Merge branch 'work' into wip/mikabox

Conflicts:

openbox/client.c
openbox/client.c
openbox/client.h