]> icculus.org git repositories - dana/openbox.git/commit
Merge branch 'backport' into 3.4-working
authorDana Jansens <danakj@orodu.net>
Sat, 2 Feb 2008 04:35:50 +0000 (23:35 -0500)
committerDana Jansens <danakj@orodu.net>
Sat, 2 Feb 2008 04:35:50 +0000 (23:35 -0500)
commit28ea97df6587b8e60efe11dbf152dc098510b62c
treeec19fcc9826d13f2da50de9b675ba589ee23a9a8
parentd025ad54fd1f79191aafe7a86b7621d7624f2683
parent6a3ac556b9ed5fd6e578da20a144f22dd4769267
Merge branch 'backport' into 3.4-working

Conflicts:

po/no.po
data/rc.xml
data/rc.xsd
openbox/config.c
openbox/frame.c