]> cloud.milkyroute.net Git - dolphin.git/commitdiff
Merge branch 'Applications/16.04'
authorDavid Edmundson <kde@davidedmundson.co.uk>
Wed, 18 May 2016 09:13:16 +0000 (10:13 +0100)
committerDavid Edmundson <kde@davidedmundson.co.uk>
Wed, 18 May 2016 09:13:16 +0000 (10:13 +0100)
1  2 
CMakeLists.txt

diff --cc CMakeLists.txt
Simple merge