Emmanuel Pescosta a06ee3399b Merge branch 'Applications/14.12' into frameworks ... Conflicts: dolphin/src/main.cpp kdepasswd/kcm/kcm_useraccount.desktop konqueror/settings/ebrowsing/ebrowsing.desktop konqueror/settings/kio/cache.desktop konqueror/settings/kio/cookies.desktop konqueror/settings/kio/netpref.desktop konqueror/settings/kio/proxy.desktop konqueror/settings/kio/smb.desktop konqueror/settings/kio/uasproviders/firefox30oncurrent.desktop konqueror/settings/kio/uasproviders/ie90onwinnt71.desktop konqueror/settings/kio/useragent.desktop lib/konq/konq_operations.cpp		2015-01-28 17:13:59 +01:00
..
CMakeLists.txt
default-ui.png
grouping-view.png
index.docbook	Merge branch 'Applications/14.12' into frameworks	2015-01-28 17:13:59 +01:00
locationbar-breadcrumb.png
locationbar-context-menu.png
locationbar-editable.png
locationbar-kioslaves-menu.png
locationbar-places-icon.png
nepomuk-search-more-options.png
nepomuk-search.png
preferences-general-behavior.png
preferences-navigation.png
preferences-services.png
preferences-startup.png
preferences-trash.png
preferences-viewmodes-icons.png
toolbar-navigation.png
toolbar-view-appearance.png
toolbar.png
viewproperties-dialog.png