Merge branch 'backport' into 3.4-working
authorDana Jansens <danakj@orodu.net>
Thu, 14 Jan 2010 21:20:10 +0000 (16:20 -0500)
committerDana Jansens <danakj@orodu.net>
Thu, 14 Jan 2010 21:20:10 +0000 (16:20 -0500)
1  2 
openbox/frame.c

diff --cc openbox/frame.c
Simple merge