Merge branch 'backport' into work
authorMikael Magnusson <mikachu@gmail.com>
Sun, 26 Oct 2008 23:58:56 +0000 (00:58 +0100)
committerMikael Magnusson <mikachu@gmail.com>
Sun, 26 Oct 2008 23:58:56 +0000 (00:58 +0100)
commite6fea245756b59f83dc0f51d13feee9cf093a1a1
treecefbc79a17772ac53d3df991d4c6a1c6a6319aaf
parent7b57ef12963a298c731d0ef4a67de9c985ac9ba4
parentc564b6245fcfaf0efd523cfa17bc1a73fe640d68
Merge branch 'backport' into work

Conflicts:
openbox/client.c
openbox/prop.c
openbox/prop.h
data/rc.xml
obt/prop.c
obt/prop.h
openbox/actions/session.c
openbox/client.c
openbox/event.c
openbox/event.h
openbox/session.c