Merge branch 'backport' into work
authorDana Jansens <danakj@orodu.net>
Fri, 2 May 2008 17:44:26 +0000 (13:44 -0400)
committerDana Jansens <danakj@orodu.net>
Fri, 2 May 2008 17:44:26 +0000 (13:44 -0400)
1  2 
openbox/event.c

diff --cc openbox/event.c
Simple merge