]> cloud.milkyroute.net Git - dolphin.git/commitdiff
projects / dolphin.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 92c0ecd 14f9a4a)
Merge branch 'Applications/15.12'
authorEmmanuel Pescosta <emmanuelpescosta099@gmail.com>
Wed, 16 Mar 2016 20:01:52 +0000 (21:01 +0100)
committerEmmanuel Pescosta <emmanuelpescosta099@gmail.com>
Wed, 16 Mar 2016 20:01:52 +0000 (21:01 +0100)
1  2 
CMakeLists.txt patch | diff1 | diff2 | blob | history

diff --cc CMakeLists.txt
Simple merge