Merge branch 'backport' into 3.4-working
authorDana Jansens <danakj@orodu.net>
Wed, 6 Jan 2010 22:32:14 +0000 (17:32 -0500)
committerDana Jansens <danakj@orodu.net>
Wed, 6 Jan 2010 22:32:14 +0000 (17:32 -0500)
commitad96eba56e381e914a12637d7742c445bbb65980
tree4484745bd246459cc058942be324d5a9c67d118b
parent31e977e8c37081f324e1b4ca0e3a58af48890ac4
parentf3285a3d0bf118ce0eba0014ea53b11f47d710d6
Merge branch 'backport' into 3.4-working

Conflicts:

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