kde/dolphin
kde/dolphin
1
0
Fork 0
mirror of https://invent.kde.org/system/dolphin synced 2024-07-15 18:01:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
4780 commits 136 branches 321 tags 89 MiB
Commit graph

4 commits

Author SHA1 Message Date
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
Montel Laurent 48788f71cf Fix docbook 2015-01-01 12:55:16 +01:00
Luca Beltrame 39cfd051ef Merge branch 'master' into frameworks 2014-09-10 10:08:20 +02:00
Christophe Giboudeaux 81d5335060 Move docs. 2014-06-29 17:51:48 +02:00