]> cloud.milkyroute.net Git - dolphin.git/commitdiff
projects / dolphin.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9f24c02 5bfb503)
Merge remote-tracking branch 'origin/KDE/4.11'
authorFrank Reininghaus <frank78ac@googlemail.com>
Mon, 7 Oct 2013 07:31:45 +0000 (09:31 +0200)
committerFrank Reininghaus <frank78ac@googlemail.com>
Mon, 7 Oct 2013 07:31:45 +0000 (09:31 +0200)
1  2 
src/dolphinviewcontainer.cpp patch | diff1 | diff2 | blob | history

diff --cc src/dolphinviewcontainer.cpp
Simple merge