]> de.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: 06953d7 f8de075)
Merge branch 'Mario/random_spawns'
authorMario <zacjardine@y7mail.com>
Fri, 28 Nov 2014 03:21:38 +0000 (14:21 +1100)
committerMario <zacjardine@y7mail.com>
Fri, 28 Nov 2014 03:21:38 +0000 (14:21 +1100)

Trivial merge