]> 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: e82756a 318ffbb)
Merge branch 'Mario/snake' into 'master'
authorMario <zacjardine@y7mail.com>
Sun, 27 Sep 2015 03:40:11 +0000 (03:40 +0000)
committerMario <zacjardine@y7mail.com>
Sun, 27 Sep 2015 03:40:11 +0000 (03:40 +0000)
Merge branch Mario/snake (Snake? Snake! SNAAAAKE!!)

Title says it all, soldier.

See merge request !231


Trivial merge