]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge branch 'Lyberta/URS3' into Lyberta/RandomStartWeapons
authorLyberta <lyberta@lyberta.net>
Sat, 2 Sep 2017 14:50:01 +0000 (17:50 +0300)
committerLyberta <lyberta@lyberta.net>
Sat, 2 Sep 2017 14:50:01 +0000 (17:50 +0300)
1  2 
qcsrc/common/t_items.qc
qcsrc/server/miscfunctions.qc

Simple merge
Simple merge