Merge branch 'backport' into 3.4-working
authorDana Jansens <danakj@orodu.net>
Mon, 11 Jan 2010 18:12:43 +0000 (13:12 -0500)
committerDana Jansens <danakj@orodu.net>
Mon, 11 Jan 2010 18:12:43 +0000 (13:12 -0500)
commit492e606f151879a7f9ffc687e188d5f5e5b20eb6
tree0e1320018b06f50715552d5ff7afdbba0913da33
parent7d9cfbb26e5dd5b2b2628a570f419349c83b1f6d
parentb8e994e837d260860a4dc0a1ee3a680e2cdfc75a
Merge branch 'backport' into 3.4-working
openbox/client.c
openbox/client.h
openbox/focus_cycle_popup.h