Merge branch 'backport' into 3.4-working
authorDana Jansens <danakj@orodu.net>
Mon, 14 Dec 2009 23:29:14 +0000 (18:29 -0500)
committerDana Jansens <danakj@orodu.net>
Mon, 14 Dec 2009 23:29:14 +0000 (18:29 -0500)
commit39db173f222a81c625b10442db609fba3d81f6b3
tree3934b417fa849db91a8f700bdfe56fba0132c73f
parent91acbb2177fea09053980caddfac6da05859a301
parent828c095c8b5a2df96a38faaeb8a0df504e68e70f
Merge branch 'backport' into 3.4-working
Makefile.am
data/rc.xml
openbox/actions/cyclewindows.c
openbox/actions/directionalwindows.c
openbox/client.c
openbox/menuframe.h
openbox/openbox.c
openbox/openbox.h
openbox/prop.h
openbox/screen.h