]> git.rm.cloudns.org Git - xonotic/xonotic-maps.pk3dir.git/commitdiff
Merge branch 'master' into kuniuthefrogg/xoylent_ctf
authorMario <zacjardine@y7mail.com>
Thu, 13 Nov 2014 18:11:36 +0000 (05:11 +1100)
committerMario <zacjardine@y7mail.com>
Thu, 13 Nov 2014 18:11:36 +0000 (05:11 +1100)
1  2 
scripts/map_xoylent.shader

Simple merge