merge r6529-6531 from trunk
authorDana Jansens <danakj@orodu.net>
Mon, 14 May 2007 13:47:25 +0000 (13:47 +0000)
committerDana Jansens <danakj@orodu.net>
Mon, 14 May 2007 13:47:25 +0000 (13:47 +0000)
commit059c86310878829d8afafee5690327ba2670a2be
tree839c1778104b647be772499ab8e032c60dd5207e
parent088c7c4892cb9770c3319bd792b174cf657f511b
merge r6529-6531 from trunk
openbox/action.c
openbox/action.h
openbox/client.c
openbox/event.c
openbox/focus.c