]> cloud.milkyroute.net Git - dolphin.git/commitdiff
Merge branch 'Applications/15.08'
authorMichael Palimaka <kensington@gentoo.org>
Fri, 25 Sep 2015 19:38:06 +0000 (05:38 +1000)
committerMichael Palimaka <kensington@gentoo.org>
Fri, 25 Sep 2015 19:38:06 +0000 (05:38 +1000)
1  2 
CMakeLists.txt

diff --cc CMakeLists.txt
Simple merge