Merge branch 'master' into Mario/crouch 540/head
authorMario <mario@smbclan.net>
Thu, 8 Mar 2018 05:33:47 +0000 (15:33 +1000)
committerMario <mario@smbclan.net>
Thu, 8 Mar 2018 05:33:47 +0000 (15:33 +1000)
commitf20db00cafb75a05d5a4ee80957d3d8b351eddea
tree7dde42b62ae0dc9581a74f6c264becb85b3ce4ed
parentb98bf384124a0866ad9e20d65f253ec21c4cb3a1
parent5a86a0b7fd6e9226f7e0816f54213ef62cd99dba
Merge branch 'master' into Mario/crouch

# Conflicts:
# qcsrc/common/physics/player.qc
# qcsrc/server/client.qc
qcsrc/common/physics/player.qc
qcsrc/server/client.qc