bad merging.. why did it make conflicts? i dunno
authorDana Jansens <danakj@orodu.net>
Fri, 4 May 2007 23:18:35 +0000 (23:18 +0000)
committerDana Jansens <danakj@orodu.net>
Fri, 4 May 2007 23:18:35 +0000 (23:18 +0000)
commitb61a258e2d8f2477cdff9ade4d7c931213c75215
treead5ccbd30327d6a5b016167b324233cd6849ba8e
parent8483349155c363a6a573f6d9b21212392610598d
bad merging.. why did it make conflicts? i dunno
openbox/client.c