Merge branch 'backport' into work
authorDana Jansens <danakj@orodu.net>
Tue, 19 Feb 2008 01:43:18 +0000 (20:43 -0500)
committerDana Jansens <danakj@orodu.net>
Tue, 19 Feb 2008 01:43:18 +0000 (20:43 -0500)
commit3263845459d15da683b7cab92fb856acbdf2800e
tree15bc390602a83a0f919e8a1faa7f8a20c8a4f542
parent9e05faf3d6ac1c527032efb7210de8bbfeb2212c
parent041d17373e046b5ee6667b10c1492bb518bac097
Merge branch 'backport' into work

Conflicts:

openbox/grab.c
openbox/keyboard.c
openbox/event.c
openbox/grab.c
openbox/keyboard.c
openbox/prompt.c
openbox/screen.c
render/theme.c