1
0
mirror of https://invent.kde.org/system/dolphin synced 2024-07-07 10:51:45 +00:00
dolphin/docs
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 Move docs. 2014-06-29 17:51:48 +02:00
default-ui.png Move docs. 2014-06-29 17:51:48 +02:00
grouping-view.png Move docs. 2014-06-29 17:51:48 +02:00
index.docbook Merge branch 'Applications/14.12' into frameworks 2015-01-28 17:13:59 +01:00
locationbar-breadcrumb.png Move docs. 2014-06-29 17:51:48 +02:00
locationbar-context-menu.png Move docs. 2014-06-29 17:51:48 +02:00
locationbar-editable.png Move docs. 2014-06-29 17:51:48 +02:00
locationbar-kioslaves-menu.png Move docs. 2014-06-29 17:51:48 +02:00
locationbar-places-icon.png Move docs. 2014-06-29 17:51:48 +02:00
nepomuk-search-more-options.png Move docs. 2014-06-29 17:51:48 +02:00
nepomuk-search.png Move docs. 2014-06-29 17:51:48 +02:00
preferences-general-behavior.png Move docs. 2014-06-29 17:51:48 +02:00
preferences-navigation.png Move docs. 2014-06-29 17:51:48 +02:00
preferences-services.png Move docs. 2014-06-29 17:51:48 +02:00
preferences-startup.png Move docs. 2014-06-29 17:51:48 +02:00
preferences-trash.png Move docs. 2014-06-29 17:51:48 +02:00
preferences-viewmodes-icons.png Move docs. 2014-06-29 17:51:48 +02:00
toolbar-navigation.png Move docs. 2014-06-29 17:51:48 +02:00
toolbar-view-appearance.png Move docs. 2014-06-29 17:51:48 +02:00
toolbar.png Move docs. 2014-06-29 17:51:48 +02:00
viewproperties-dialog.png Move docs. 2014-06-29 17:51:48 +02:00