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

projects / mikachu / openbox.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 241b412 3d254cd)

author	Mikael Magnusson <mikachu@comhem.se>
	Thu, 27 Mar 2008 13:56:33 +0000 (14:56 +0100)
committer	Mikael Magnusson <mikachu@comhem.se>
	Thu, 27 Mar 2008 13:56:33 +0000 (14:56 +0100)
commit	0534fa498cbc0c4f435d70598b736d5e46863ba3
tree	b39563d9803e7c934caddd273c9bfa8b6686d7f4	tree \| snapshot
parent	241b41273a7cd93c142817240f7ed6dbb759f86d	commit \| diff
parent	3d254cd35fca2a11b50a88f0e77d638649cbd108	commit \| diff

Merge branch 'backport' into 3.4

openbox/actions/cyclewindows.c	diff1 \|	diff2 \|	blob \| history
openbox/actions/desktop.c	diff1 \|	diff2 \|	blob \| history
openbox/actions/directionalwindows.c	diff1 \|	diff2 \|	blob \| history
openbox/client.h	diff1 \|	diff2 \|	blob \| history
openbox/config.h	diff1 \|	diff2 \|	blob \| history
openbox/frame.c	diff1 \|	diff2 \|	blob \| history
openbox/openbox.c	diff1 \|	diff2 \|	blob \| history
openbox/session.c	diff1 \|	diff2 \|	blob \| history

Openbox Window Manager