Merge branch 'work' into wip/mikabox
authorMikael Magnusson <mikachu@comhem.se>
Wed, 23 Apr 2008 15:07:42 +0000 (17:07 +0200)
committerMikael Magnusson <mikachu@comhem.se>
Wed, 23 Apr 2008 15:07:42 +0000 (17:07 +0200)
commit953dcb9c8b72861b2e82d9d01c2b00de510fcc14
tree154b1ddeb8f32653e0d9dbbbe6f25373a20d2e85
parent238703fd2ccb9bb3f757323d622dcc1355804fa2
parent6799c67c07e99c440f549802f60d9f16995ab711
Merge branch 'work' into wip/mikabox

Conflicts:

openbox/moveresize.c
Makefile.am
openbox/client.c
openbox/client.h
openbox/config.c