Merge branch 'master' into TimePath/global_self
authorTimePath <andrew.hardaker1995@gmail.com>
Wed, 2 Sep 2015 10:05:23 +0000 (20:05 +1000)
committerTimePath <andrew.hardaker1995@gmail.com>
Wed, 2 Sep 2015 10:05:23 +0000 (20:05 +1000)
commit1c758278958da8f2baf1f39cd0f298d5bda097a2
tree01666b091d0d996a637cc2da383bd1e41ddb2073
parenteeec5ec4584c71acbb89db6eea843b48d6ca4c26
parentb822740ca8df332014ffcb6c62d3aee87f636925
Merge branch 'master' into TimePath/global_self

# Conflicts:
# qcsrc/common/weapons/weapon/vaporizer.qc
qcsrc/common/weapons/weapon/vaporizer.qc
qcsrc/server/cl_player.qc
qcsrc/server/mutators/mutator_instagib.qc