Go to file
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
docs Merge branch 'Applications/14.12' into frameworks 2015-01-28 17:13:59 +01:00
src Merge branch 'Applications/14.12' into frameworks 2015-01-28 17:13:59 +01:00
AUTHORS updated to KDE 4 (the file was valid for Dolphin for KDE 3) 2008-07-07 09:18:51 +00:00
CMakeLists.txt Increase version 2014-10-19 15:07:34 +02:00
COPYING commited initial version of Dolphin 2006-11-21 06:02:05 +00:00
COPYING.DOC updates for new licence policy 2008-01-12 16:39:07 +00:00
README it's http://dolphin.kde.org/ now 2008-07-26 14:01:34 +00:00

See http://dolphin.kde.org for information about Dolphin.