Merge branch 'master' into 3.4-working
authorDana Jansens <danakj@orodu.net>
Sun, 22 Jul 2007 12:53:21 +0000 (08:53 -0400)
committerDana Jansens <danakj@orodu.net>
Sun, 22 Jul 2007 12:53:21 +0000 (08:53 -0400)
1  2 
openbox/actions/moveresizeto.c

Simple merge