]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge branch 'Lyberta/DebugPrintToChat' into Lyberta/Survival
authorLyberta <lyberta@lyberta.net>
Thu, 23 Mar 2017 05:19:36 +0000 (08:19 +0300)
committerLyberta <lyberta@lyberta.net>
Thu, 23 Mar 2017 05:19:36 +0000 (08:19 +0300)
1  2 
qcsrc/server/player.qc
qcsrc/server/player.qh

Simple merge
Simple merge