]> 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: 56905f3 9179659)
Merge branch 'master' into TimePath/experiments/csqc_prediction
authorMario <zacjardine@y7mail.com>
Tue, 16 Dec 2014 08:52:31 +0000 (19:52 +1100)
committerMario <zacjardine@y7mail.com>
Tue, 16 Dec 2014 08:52:31 +0000 (19:52 +1100)

Trivial merge