Merge branch 'backport' into work
authorDana Jansens <danakj@orodu.net>
Sun, 2 Mar 2008 22:23:23 +0000 (17:23 -0500)
committerDana Jansens <danakj@orodu.net>
Sun, 2 Mar 2008 22:23:23 +0000 (17:23 -0500)
commit7fb107cd37a09787c5cfa590688944b3bcb2bab8
treebdd5bbf3eb5d4594dc9ae5b90bf553f14ee0946d
parentac255432b46617fe01fd40fd02fdea878893ce3c
parentf542c5143ac115937c5ee8f3a229e557383cd180
Merge branch 'backport' into work

Conflicts:

openbox/actions/execute.c
openbox/event.c
openbox/openbox.c
openbox/openbox.h
12 files changed:
openbox/actions/execute.c
openbox/actions/exit.c
openbox/actions/session.c
openbox/client.c
openbox/debug.c
openbox/event.c
openbox/misc.h
openbox/openbox.c
openbox/openbox.h
openbox/prompt.c
openbox/prompt.h
openbox/screen.c