]> cloud.milkyroute.net Git - dolphin.git/commit
Merge remote-tracking branch 'origin/master' into frameworks
authorFrank Reininghaus <frank78ac@googlemail.com>
Thu, 16 Oct 2014 18:36:49 +0000 (20:36 +0200)
committerFrank Reininghaus <frank78ac@googlemail.com>
Thu, 16 Oct 2014 18:36:49 +0000 (20:36 +0200)
commit01e4f60a0931aba506b184d384a4e2f926b2233c
tree902da94d4ed035af9da2aea537708cdc2ea14d9c
parentcd601a582d5454dfa1818bae7e50864e9bece575
parenta75e81ca01ea61c615582e93ceed69398967831e
Merge remote-tracking branch 'origin/master' into frameworks

Conflicts:
dolphin/src/main.cpp
kdepasswd/kcm/kcm_useraccount.desktop
plasma/applets/folderview/folderview.cpp
src/main.cpp
src/org.kde.dolphin.desktop
src/settings/kcm/kcmdolphingeneral.desktop
src/settings/kcm/kcmdolphinnavigation.desktop
src/statusbar/dolphinstatusbar.cpp