cloud.milkyroute.net Git - dolphin.git/commit

author	Christophe Giboudeaux <cgiboudeaux@gmx.com>
	Mon, 7 Jan 2013 17:22:28 +0000 (18:22 +0100)
committer	Christophe Giboudeaux <cgiboudeaux@gmx.com>
	Mon, 7 Jan 2013 17:22:28 +0000 (18:22 +0100)
commit	feae9f9dfc9e1a04135ddc7efa16eb1294be4850
tree	dbd3d5dc909d77fb6b68a1352623f0b9afa3faca	tree
parent	2e88d73423fd88f676620d714ce159587656e6ca	commit \| diff
parent	6b351820a3405a1ce60916132a277435efabd685	commit \| diff

Merge branch 'KDE/4.10'

Conflicts:
dolphin/src/CMakeLists.txt