]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge branch 'master' into Lyberta/TeamplayOverhaul
authorLyberta <lyberta@lyberta.net>
Sat, 16 Jun 2018 09:07:58 +0000 (12:07 +0300)
committerLyberta <lyberta@lyberta.net>
Sat, 16 Jun 2018 09:07:58 +0000 (12:07 +0300)
1  2 
qcsrc/common/gamemodes/gamemode/onslaught/sv_onslaught.qc
qcsrc/common/t_items.qc

Simple merge