]> cloud.milkyroute.net Git - dolphin.git/commitdiff
projects / dolphin.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e3b840e 96ba990)
Merge remote-tracking branch 'origin/KDE/4.11'
authorDavid Faure <faure@kde.org>
Tue, 15 Oct 2013 07:08:47 +0000 (09:08 +0200)
committerDavid Faure <faure@kde.org>
Tue, 15 Oct 2013 07:08:47 +0000 (09:08 +0200)
1  2 
src/dolphinmainwindow.cpp patch | diff1 | diff2 | blob | history

diff --cc src/dolphinmainwindow.cpp
Simple merge