]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit - qcsrc/server/command/common.qh
Merge branch 'master' into Mario/monsters_broken
authorTimePath <andrew.hardaker1995@gmail.com>
Sat, 29 Aug 2015 12:26:05 +0000 (22:26 +1000)
committerTimePath <andrew.hardaker1995@gmail.com>
Sat, 29 Aug 2015 12:26:05 +0000 (22:26 +1000)
commitb557753cb5b1d9c92ef9ab17cb03d74bcbb75485
treec12ca03a0d5356a8f3f09cf68860a54a380b44ab
parentff77eb42291c25b2e06a7897e6e486cca7ee8a70
parente4ac65ac2e770b795d1234ead3b2c25731f39bb3
Merge branch 'master' into Mario/monsters_broken

# Conflicts:
# qcsrc/common/monsters/sv_monsters.qc
qcsrc/client/csqcmodel_hooks.qc
qcsrc/common/monsters/monster/mage.qc
qcsrc/common/monsters/monster/shambler.qc
qcsrc/common/monsters/monster/spider.qc
qcsrc/common/monsters/monster/wyvern.qc
qcsrc/common/monsters/sv_monsters.qc
qcsrc/server/command/sv_cmd.qc