git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit

]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit - qcsrc/common/weapons/w_rpc.qc

author	TimePath <andrew.hardaker1995@gmail.com>
	Sat, 29 Aug 2015 12:26:05 +0000 (22:26 +1000)
committer	TimePath <andrew.hardaker1995@gmail.com>
	Sat, 29 Aug 2015 12:26:05 +0000 (22:26 +1000)
commit	b557753cb5b1d9c92ef9ab17cb03d74bcbb75485
tree	c12ca03a0d5356a8f3f09cf68860a54a380b44ab	tree \| snapshot
parent	ff77eb42291c25b2e06a7897e6e486cca7ee8a70	commit \| diff
parent	e4ac65ac2e770b795d1234ead3b2c25731f39bb3	commit \| diff

Merge branch 'master' into Mario/monsters_broken

# Conflicts:
# qcsrc/common/monsters/sv_monsters.qc

qcsrc/client/csqcmodel_hooks.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/monsters/monster/mage.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/monsters/monster/shambler.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/monsters/monster/spider.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/monsters/monster/wyvern.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/monsters/sv_monsters.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/command/sv_cmd.qc	diff1 \|	diff2 \|	blob \| history