mirror of
https://invent.kde.org/system/dolphin
synced 2024-10-28 03:21:56 +00:00
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
This commit is contained in:
commit
9d73c1ad7f