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