merge r5756-r5759 from trunk
authorDana Jansens <danakj@orodu.net>
Sun, 22 Apr 2007 00:37:38 +0000 (00:37 +0000)
committerDana Jansens <danakj@orodu.net>
Sun, 22 Apr 2007 00:37:38 +0000 (00:37 +0000)
commitbc3036cfde6e6fa51c45bfe19abc32b5d7cc9102
tree809764b12d960a9a7b60ce169a5df83b27c9f0db
parent6b56330521a6d6976f07d0c0ebb0716421928483
merge r5756-r5759 from trunk
14 files changed:
data/menu.xml.in
openbox/client_list_combined_menu.c
openbox/client_list_menu.c
openbox/client_menu.c
openbox/event.c
openbox/grab.c
openbox/menu.c
openbox/menu.h
openbox/menuframe.c
openbox/menuframe.h
openbox/openbox.c
openbox/window.c
openbox/window.h
parser/parse.c