From: Albert Astals Cid <aacid@kde.org>
Date: Fri, 15 Mar 2013 20:55:53 +0000 (+0100)
Subject: Merge remote-tracking branch 'origin/KDE/4.10'
X-Git-Url: https://cloud.milkyroute.net/gitweb/dolphin.git/commitdiff_plain/9d73c1ad7f123dfebbd1f0fade8cf8a2e3cac444

Merge remote-tracking branch 'origin/KDE/4.10'

Conflicts:
	dolphin/src/dolphin.desktop
	konq-plugins/searchbar/searchbar.desktop
	konqueror/settings/kio/proxy.desktop
	konqueror/settings/kio/uasproviders/chrome10onwinnt51.desktop
	konqueror/settings/kio/uasproviders/chrome50oncurrent.desktop
	konqueror/settings/kio/uasproviders/googlebot.desktop
	konqueror/settings/kio/uasproviders/ie60oncurrent.desktop
	konqueror/settings/kio/uasproviders/op90oncurrent.desktop
	konqueror/settings/kio/uasproviders/safari20.desktop
	konqueror/sidebar/default_entries/history.desktop
	konqueror/sidebar/default_entries/root.desktop
	konqueror/sidebar/history_module/kcmhistory.desktop
---

9d73c1ad7f123dfebbd1f0fade8cf8a2e3cac444