Merge branch 'backport' into 3.4-working
authorDana Jansens <danakj@orodu.net>
Thu, 14 Feb 2008 20:16:10 +0000 (15:16 -0500)
committerDana Jansens <danakj@orodu.net>
Thu, 14 Feb 2008 20:16:10 +0000 (15:16 -0500)
commit591b261df14cf987dddf17137a87cd15c9d25fa7
tree7f4732317d49d738433d55708716ccf78c5666dd
parent1ad76cee19d5b34fa62a2d713a3b6ebaa8140ab4
parentcec5480108e2d4158ba5086223e07cc34587dff5
Merge branch 'backport' into 3.4-working

Conflicts:

openbox/actions/focus.c
Makefile.am
data/rc.xml
data/rc.xsd
openbox/actions/focus.c
openbox/config.c