]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 112379c 5d0ee5b)
Merge branch 'master' into TimePath/issue-1170
authorTimePath <andrew.hardaker1995@gmail.com>
Mon, 15 Dec 2014 06:41:09 +0000 (17:41 +1100)
committerTimePath <andrew.hardaker1995@gmail.com>
Mon, 15 Dec 2014 06:41:09 +0000 (17:41 +1100)

Trivial merge