Merge branch 'master' into 3.4-working
authorDana Jansens <danakj@orodu.net>
Sat, 21 Jul 2007 19:57:20 +0000 (15:57 -0400)
committerDana Jansens <danakj@orodu.net>
Sat, 21 Jul 2007 19:57:20 +0000 (15:57 -0400)
1  2 
openbox/actions/moveresizeto.c

Simple merge