]> cloud.milkyroute.net Git - dolphin.git/commitdiff
Merge branch 'Applications/16.04'
authorWolfgang Bauer <wbauer@tmo.at>
Tue, 26 Apr 2016 14:17:59 +0000 (16:17 +0200)
committerWolfgang Bauer <wbauer@tmo.at>
Tue, 26 Apr 2016 14:17:59 +0000 (16:17 +0200)
1  2 
CMakeLists.txt

diff --cc CMakeLists.txt
Simple merge