]> cloud.milkyroute.net Git - dolphin.git/commitdiff
projects / dolphin.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 03adb27 31f0acc)
Merge branch 'Applications/15.08'
authorHarald Sitter <sitter@kde.org>
Fri, 21 Aug 2015 10:12:54 +0000 (12:12 +0200)
committerHarald Sitter <sitter@kde.org>
Fri, 21 Aug 2015 10:12:54 +0000 (12:12 +0200)
Conflicts:
CMakeLists.txt

1  2 
CMakeLists.txt patch | diff1 | diff2 | blob | history

diff --cc CMakeLists.txt
Simple merge