]> 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: c83334e 1cb2737)
Merge remote-tracking branch 'origin/TimePath/gametypes/infection' into TimePath...
authorTimePath <andrew.hardaker1995@gmail.com>
Wed, 21 Jan 2015 06:18:49 +0000 (17:18 +1100)
committerTimePath <andrew.hardaker1995@gmail.com>
Wed, 21 Jan 2015 06:18:49 +0000 (17:18 +1100)

Trivial merge