]> cloud.milkyroute.net Git - dolphin.git/commit
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)
commitdc7b83169d4ed55d402de71b38b6cd8d1e2fda8d
tree9c6dff4a82052ab25beddcd25da7c63eecf13ae4
parent03adb27dc8b3b1f8b54c6e2d03538b79e99178fe
parent31f0acc72653972845f83abd60eaffde511801f1
Merge branch 'Applications/15.08'

Conflicts:
CMakeLists.txt
CMakeLists.txt