]> 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: 498bd21 35cf636)
Merge branch 'master' into nyov/combined_updates/effects
authorMario <zacjardine@y7mail.com>
Thu, 27 Nov 2014 01:34:08 +0000 (12:34 +1100)
committerMario <zacjardine@y7mail.com>
Thu, 27 Nov 2014 01:34:08 +0000 (12:34 +1100)

Trivial merge