Merge branch 'backport' into work
authorDana Jansens <danakj@orodu.net>
Fri, 18 Dec 2009 16:39:56 +0000 (11:39 -0500)
committerDana Jansens <danakj@orodu.net>
Fri, 18 Dec 2009 16:39:56 +0000 (11:39 -0500)
commit965ed8907a5dd81d5ffbc93b67a672fa78833854
tree9e02aed49fd664e5d5b73e417d4a2b5b73e793a3
parentaeac6294a3c45c10d04f108a6fc767298132735c
parent01fd9f99cc5cbe4783a7b7807b51b87269250212
Merge branch 'backport' into work

Conflicts:

openbox/screen.c
openbox/event.c
openbox/focus_cycle.c
openbox/focus_cycle_popup.c
openbox/focus_cycle_popup.h
openbox/screen.c