icculus.org git repositories - dana/openbox.git/commit

]> icculus.org git repositories - dana/openbox.git/commit

projects / dana / openbox.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 76da4f0 ba1ac21)

author	Mikael Magnusson <mikachu@gmail.com>
	Sun, 5 Jul 2009 20:37:32 +0000 (22:37 +0200)
committer	Mikael Magnusson <mikachu@gmail.com>
	Sun, 5 Jul 2009 20:37:32 +0000 (22:37 +0200)
commit	903e469cdef66f8cb4b8297405ead069cd81878c
tree	ec09423f1faeedc97dce3769b99269693de2f24f	tree
parent	76da4f00510e301df0a457fd87a8fd4b42004a66	commit \| diff
parent	ba1ac214dfdbc0539c922e84c2318c1bf2566c0c	commit \| diff

Merge branch 'backport' into 3.4

Conflicts:
data/rc.xsd
openbox/actions/desktop.c

configure.ac	diff1 \|	diff2 \|	blob \| history
openbox/actions/desktop.c	diff1 \|	diff2 \|	blob \| history
openbox/actions/moveresizeto.c	diff1 \|	diff2 \|	blob \| history
openbox/client.c	diff1 \|	diff2 \|	blob \| history
openbox/frame.c	diff1 \|	diff2 \|	blob \| history
po/en@boldquot.po	diff1 \|	diff2 \|	blob \| history
po/en@quot.po	diff1 \|	diff2 \|	blob \| history
po/hr.po	diff1 \|	diff2 \|	blob \| history
po/it.po	diff1 \|	diff2 \|	blob \| history
po/lv.po	\|	diff2 \|	blob \| history

Openbox Window Manager