merge r6016-6018 from trunk
authorDana Jansens <danakj@orodu.net>
Fri, 4 May 2007 02:48:56 +0000 (02:48 +0000)
committerDana Jansens <danakj@orodu.net>
Fri, 4 May 2007 02:48:56 +0000 (02:48 +0000)
commit2f8d827147a02e8599e9e27593477e23ef64aa09
treea7c3fd53aa5e6ae4c0a1c2273fa364b33c657180
parentde27a30c674ef7bb487a722d38706d877c02d328
merge r6016-6018 from trunk
openbox/client.c
openbox/event.c