Merge branch 'backport' into 3.4-working
authorDana Jansens <danakj@orodu.net>
Wed, 9 Dec 2009 20:09:49 +0000 (15:09 -0500)
committerDana Jansens <danakj@orodu.net>
Wed, 9 Dec 2009 20:09:49 +0000 (15:09 -0500)
commit8ba9884fd7406e579ba884794e4ec6539afcf947
tree5072b2805bf7742015fb4761788ccbe6e934fc51
parent0b247562c6013f4d86b0235f0dce826f0cbf7a6b
parent7a926bb82fc724b3a1b50a385b4040ab7fee6878
Merge branch 'backport' into 3.4-working

Conflicts:

openbox/actions/focus.c
openbox/actions/focus.c
openbox/client.c
openbox/client.h
openbox/config.c
openbox/focus.h
openbox/frame.c