Merge branch 'backport' into work
authorDana Jansens <danakj@orodu.net>
Thu, 6 Mar 2008 07:46:32 +0000 (02:46 -0500)
committerDana Jansens <danakj@orodu.net>
Thu, 6 Mar 2008 07:46:32 +0000 (02:46 -0500)
commit18141d78dab9e19161cae3e7e89f8b95591a2e9b
tree326d328ded5628ced985a84b8546e9362909c732
parent40377ab10a5970b20ab005a3d4994dfdf244cd4c
parentae0971659fdd41fc7e9ccb6ca2b2536f96c09061
Merge branch 'backport' into work

Conflicts:

openbox/client.c
.gitignore
openbox/client.c
openbox/client.h
render/image.c