Merge branch 'master' into martin-t/msnt
authorMartin Taibr <taibr.martin@gmail.com>
Fri, 7 Oct 2016 20:04:28 +0000 (22:04 +0200)
committerMartin Taibr <taibr.martin@gmail.com>
Fri, 7 Oct 2016 20:04:28 +0000 (22:04 +0200)
commit7c8f38e643c87bf9c02c2265ca43714c57ebe331
treefcd6ae00e3b0a5271271c07eadc3b41b096e63a6
parent7c19f3ad74b2adb7d2490d3d6b33fc9f1eda007f
parentf366b93e1d9e8ebdff81c9277f9958178dcb38d0
Merge branch 'master' into martin-t/msnt
qcsrc/common/mutators/mutator/spawn_near_teammate/sv_spawn_near_teammate.qc