Merge branch 'backport' into work
authorDana Jansens <danakj@orodu.net>
Tue, 26 Feb 2008 08:15:21 +0000 (03:15 -0500)
committerDana Jansens <danakj@orodu.net>
Tue, 26 Feb 2008 08:15:21 +0000 (03:15 -0500)
1  2 
openbox/event.c
openbox/mouse.c

diff --cc openbox/event.c
Simple merge
diff --cc openbox/mouse.c
Simple merge