]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | compact (merge: 671c051 a49ea31)
Merge branch 'master' into TimePath/issues/1428
authorTimePath <andrew.hardaker1995@gmail.com>
Sat, 20 Dec 2014 11:00:02 +0000 (22:00 +1100)
committerTimePath <andrew.hardaker1995@gmail.com>
Sat, 20 Dec 2014 11:00:02 +0000 (22:00 +1100)

Trivial merge