Merge branch 'backport' into work
authorDana Jansens <danakj@orodu.net>
Tue, 8 Dec 2009 19:19:04 +0000 (14:19 -0500)
committerDana Jansens <danakj@orodu.net>
Tue, 8 Dec 2009 19:19:04 +0000 (14:19 -0500)
commit2f09e0ce388f63c341cb328d795766e2bd0dc24b
tree14fb36919947e80ba0dfc151d0f1f02ed46fd712
parent84843c3f9842046e34366202f1a8f80ce8565f91
parent672aea85cfe2ac2bc8cb4e3f34fd023f10d90182
Merge branch 'backport' into work

Conflicts:

openbox/actions/all.h
openbox/actions/session.c
openbox/client.c
openbox/event.c
openbox/grab.c
Makefile.am
openbox/actions/all.c
openbox/actions/all.h
openbox/actions/exit.c
openbox/client.c
openbox/client.h
openbox/event.c
openbox/focus.c
openbox/session.c