]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge branch 'martin-t/blaster' into martin-t/master2
authorMartin Taibr <taibr.martin@gmail.com>
Mon, 26 Aug 2019 18:33:26 +0000 (20:33 +0200)
committerMartin Taibr <taibr.martin@gmail.com>
Mon, 26 Aug 2019 18:33:26 +0000 (20:33 +0200)
1  2 
bal-wep-xonotic.cfg

Simple merge