merge r7264 from trunk
authorDana Jansens <danakj@orodu.net>
Sat, 2 Jun 2007 19:17:14 +0000 (19:17 +0000)
committerDana Jansens <danakj@orodu.net>
Sat, 2 Jun 2007 19:17:14 +0000 (19:17 +0000)
commitb7f828f82a9090ddc0efd2fe65554f881cd0b6c1
tree372879131f78099ceb82298229014b1c9e81100c
parentd6fac0b54b11175e0dc774542e7690323ca3f789
merge r7264 from trunk
openbox/event.c
openbox/menu.c
openbox/menu.h