]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into Lyberta/Survival
authorLyberta <lyberta@lyberta.net>
Wed, 12 Apr 2017 03:52:45 +0000 (06:52 +0300)
committerLyberta <lyberta@lyberta.net>
Wed, 12 Apr 2017 03:52:45 +0000 (06:52 +0300)
commit121f83a4533d6c29ec468d7cd31a5d473d1f2aed
tree5d2b7c3ce83459834a0514e133ad1545997fa1bd
parentf88776a8a64a2dc22522064b8a100b6b981063fa
parent35e6231f19b5bab89de9584e5fd3509725f11f9e
Merge branch 'master' into Lyberta/Survival
qcsrc/server/player.qc
qcsrc/server/player.qh