merge r6494-6502 from trunk
authorDana Jansens <danakj@orodu.net>
Sun, 13 May 2007 23:16:17 +0000 (23:16 +0000)
committerDana Jansens <danakj@orodu.net>
Sun, 13 May 2007 23:16:17 +0000 (23:16 +0000)
commit0208df5d1cb5aa319a5db713c2a322a1401ca70f
tree1112ab02e4cf30c787a63a52294ba6b715520fe9
parentdb08c153edad0ff97e552cfe318a21091b8c90a4
merge r6494-6502 from trunk
14 files changed:
Makefile.am
data/rc-gnome.xml [new file with mode: 0644]
data/rc-kde.xml [new file with mode: 0644]
data/xsession/openbox-gnome-session.in
data/xsession/openbox-kde-session.in
doc/openbox-gnome-session.1.sgml
doc/openbox-kde-session.1.sgml
doc/openbox.1.in
doc/openbox.1.sgml
openbox/event.c
openbox/openbox.c
openbox/openbox.h
openbox/session.c
openbox/startupnotify.c