Merge branch 'master' into TimePath/global_self
authorTimePath <andrew.hardaker1995@gmail.com>
Sat, 5 Sep 2015 02:07:13 +0000 (12:07 +1000)
committerTimePath <andrew.hardaker1995@gmail.com>
Sat, 5 Sep 2015 02:07:13 +0000 (12:07 +1000)
commitef74e1ba8e890befb4a4892a96d244a66c05fd48
treee1afc804ba0ac148d5f8e384fd6968e7e69c7a51
parent1e2d8682cb9eec160fa9def1b8434a9d385f0d88
parente744d300162d41aec3e2a7f146012635e040b77a
Merge branch 'master' into TimePath/global_self

# Conflicts:
# qcsrc/server/mutators/mutator_instagib.qc
# qcsrc/server/mutators/mutator_instagib_items.qc
qcsrc/common/movetypes/movetypes.qc
qcsrc/common/movetypes/walk.qc
qcsrc/common/mutators/mutator/waypoints/waypointsprites.qc
qcsrc/server/mutators/mutator_instagib.qc