git.openbox.org Git - dana/openbox.git/commit

projects / dana / openbox.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 91acbb2 828c095)

author	Dana Jansens <danakj@orodu.net>
	Mon, 14 Dec 2009 23:29:14 +0000 (18:29 -0500)
committer	Dana Jansens <danakj@orodu.net>
	Mon, 14 Dec 2009 23:29:14 +0000 (18:29 -0500)
commit	39db173f222a81c625b10442db609fba3d81f6b3
tree	3934b417fa849db91a8f700bdfe56fba0132c73f	tree \| snapshot
parent	91acbb2177fea09053980caddfac6da05859a301	commit \| diff
parent	828c095c8b5a2df96a38faaeb8a0df504e68e70f	commit \| diff

Merge branch 'backport' into 3.4-working

Makefile.am	diff1 \|	diff2 \|	blob \| history
data/rc.xml	diff1 \|	diff2 \|	blob \| history
openbox/actions/cyclewindows.c	diff1 \|	diff2 \|	blob \| history
openbox/actions/directionalwindows.c	diff1 \|	diff2 \|	blob \| history
openbox/client.c	diff1 \|	diff2 \|	blob \| history
openbox/menuframe.h	diff1 \|	diff2 \|	blob \| history
openbox/openbox.c	diff1 \|	diff2 \|	blob \| history
openbox/openbox.h	diff1 \|	diff2 \|	blob \| history
openbox/prop.h	diff1 \|	diff2 \|	blob \| history
openbox/screen.h	diff1 \|	diff2 \|	blob \| history

Openbox Window Manager