]> cloud.milkyroute.net Git - dolphin.git/commitdiff
projects / dolphin.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: fc4315d abd114f)
Merge branch 'master' into frameworks
authorLuca Beltrame <luca.beltrame@marionegri.it>
Wed, 16 Jul 2014 08:13:57 +0000 (10:13 +0200)
committerLuca Beltrame <luca.beltrame@marionegri.it>
Wed, 16 Jul 2014 08:13:57 +0000 (10:13 +0200)
Conflicts:
kdepasswd/kcm/kcm_useraccount.desktop [deleted in frameworks branch]
plasma/applets/folderview/plasma-applet-folderview.desktop [deleted in frameworks branch]

1  2 
src/dolphinmainwindow.cpp patch | diff1 | diff2 | blob | history

diff --cc src/dolphinmainwindow.cpp
Simple merge