]> cloud.milkyroute.net Git - dolphin.git/commit
projects / dolphin.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(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)
commite242d9548d11d92568a648efece5ff6c280b36cd
tree414cc5b1eb313abf6b52ce978ee61e1f649167c3tree
parentfc4315d57e8fe64d05aad2a1c24800f0149b21dacommit | diff
parentabd114f710b9d1247ecea4a82fb338492e9caf78commit | diff
Merge branch 'master' into frameworks

Conflicts:
kdepasswd/kcm/kcm_useraccount.desktop [deleted in frameworks branch]
plasma/applets/folderview/plasma-applet-folderview.desktop [deleted in frameworks branch]
src/dolphinmainwindow.cpp diff1 | diff2 | blob | history