Merge branch 'backport' into work
authorDana Jansens <danakj@orodu.net>
Sun, 2 Mar 2008 09:18:17 +0000 (04:18 -0500)
committerDana Jansens <danakj@orodu.net>
Sun, 2 Mar 2008 09:19:05 +0000 (04:19 -0500)
commit37705f444eecabb2e5bd31e92bc8b82ae9b8b596
tree6c2ef624542f53985773b3399ca49baacbbf7d77
parenta47d0a53652a96ca1df96fc9268757df1431ae55
parente8ce4dbb8fa8f415759745d57bb1c971ea360ec5
Merge branch 'backport' into work

Conflicts:

openbox/actions/all.h
openbox/event.c
openbox/prompt.c
Makefile.am
openbox/actions/all.h
openbox/actions/exit.c
openbox/actions/session.c
openbox/event.c
openbox/prompt.c
openbox/session.c