Merge branch 'master' into 3.4-working
authorDana Jansens <danakj@orodu.net>
Thu, 19 Jul 2007 18:01:49 +0000 (14:01 -0400)
committerDana Jansens <danakj@orodu.net>
Thu, 19 Jul 2007 18:01:49 +0000 (14:01 -0400)
commit2328486d1428935b4cb45b4b9d4337d6dcb6b9b8
tree18b2e50590cc6092ef6687aa1e107e528069d8f4
parenteb9fbd63dd97650523a8a1e004f0088da109b5ef
parent2dbd1fb6e85f82e5635128c47932a0df52f66512
Merge branch 'master' into 3.4-working
openbox/actions/desktop.c
openbox/actions/focus.c
openbox/config.c
openbox/frame.c