merge r6310-6311 from trunk
authorDana Jansens <danakj@orodu.net>
Thu, 10 May 2007 23:23:31 +0000 (23:23 +0000)
committerDana Jansens <danakj@orodu.net>
Thu, 10 May 2007 23:23:31 +0000 (23:23 +0000)
commit580219ea393594f8aee55bcd5495f6db51cce46f
tree338290dba157f4e32749409d7b55c73e58ec299b
parentc50f23164b1823feacdc2986669a0f28968b042a
merge r6310-6311 from trunk
openbox/action.c
openbox/client.c
openbox/client.h
openbox/client_menu.c
openbox/event.c
openbox/screen.c
openbox/screen.h
openbox/stacking.h