Merge branch 'backport' into work
authorDana Jansens <danakj@orodu.net>
Fri, 8 Jan 2010 15:22:30 +0000 (10:22 -0500)
committerDana Jansens <danakj@orodu.net>
Fri, 8 Jan 2010 15:22:30 +0000 (10:22 -0500)
commit73575c10ce3ede1637e4f959b56e1f7d5f110b91
tree9af1e7061d53dcc62be4000fc206cfcaa71cc4a8
parent4f414ed0f124fa67b61d347899aa3b30aa0294f1
parentf163c46eaf01ced8405fa36a3bf4a5c488f0f5aa
Merge branch 'backport' into work

Conflicts:

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