]> git.rm.cloudns.org Git - xonotic/netradiant.git/commitdiff
projects / xonotic / netradiant.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6112a0c 353a36a)
Merge branch 'TimePath/cmake' into Melanosuchus/cmake
authorTimePath <andrew.hardaker1995@gmail.com>
Sun, 26 Jul 2015 10:23:48 +0000 (20:23 +1000)
committerTimePath <andrew.hardaker1995@gmail.com>
Sun, 26 Jul 2015 10:24:51 +0000 (20:24 +1000)
1  2 
CMakeLists.txt patch | diff1 | diff2 | blob | history

diff --cc CMakeLists.txt
Simple merge