]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 94c373a 4459560)
Merge branch 'TimePath/cmake'
authorTimePath <andrew.hardaker1995@gmail.com>
Thu, 14 Apr 2016 12:16:44 +0000 (22:16 +1000)
committerTimePath <andrew.hardaker1995@gmail.com>
Thu, 14 Apr 2016 12:16:44 +0000 (22:16 +1000)

Trivial merge