merge r6937 from trunk
authorDana Jansens <danakj@orodu.net>
Sun, 27 May 2007 14:51:40 +0000 (14:51 +0000)
committerDana Jansens <danakj@orodu.net>
Sun, 27 May 2007 14:51:40 +0000 (14:51 +0000)
commit9ca08a1fa878e29a40e8f4f296010e0e1e3cfae9
tree9e025a229b7f8a221a784521d8adde259692492b
parent17da0b3d701b1c0ddf442a1e4818938ffe586a9e
merge r6937 from trunk
openbox/client.c
tests/confignotify.c