]> git.xonotic.org Git - xonotic/xonotic.git/commitdiff
projects / xonotic / xonotic.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9297491 4e3a68e)
Merge branch 'TimePath/cmake'
authorTimePath <andrew.hardaker1995@gmail.com>
Thu, 14 Apr 2016 04:21:46 +0000 (14:21 +1000)
committerTimePath <andrew.hardaker1995@gmail.com>
Thu, 14 Apr 2016 04:21:46 +0000 (14:21 +1000)

Trivial merge