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

author	Christophe Giboudeaux <cgiboudeaux@gmx.com>
	Wed, 2 Jan 2013 14:28:43 +0000 (15:28 +0100)
committer	Christophe Giboudeaux <cgiboudeaux@gmx.com>
	Wed, 2 Jan 2013 14:28:43 +0000 (15:28 +0100)
commit	56f1c0371c4e5d9f874dede5e4773165f88cbbb6
tree	35f7130e0f6e0610017658643571f4229fedce55	tree
parent	ed4644bd875bce2bb797a96652b4aced9eb75976	commit \| diff
parent	bf202f3931c804af1c03bd958a8e946bab8b4b52	commit \| diff

Merge branch 'KDE/4.10'

Conflicts:
dolphin/src/CMakeLists.txt