Merge branch 'backport' into 3.4-working
authorDana Jansens <danakj@orodu.net>
Thu, 21 Feb 2008 18:24:29 +0000 (13:24 -0500)
committerDana Jansens <danakj@orodu.net>
Thu, 21 Feb 2008 18:24:29 +0000 (13:24 -0500)
1  2 
openbox/actions/moveresizeto.c
openbox/config.c
openbox/mouse.c
openbox/openbox.c
openbox/session.c

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