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

]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit - gfx/hud/default/buff_disability.tga

author	Mario <zacjardine@y7mail.com>
	Fri, 21 Aug 2015 06:00:56 +0000 (16:00 +1000)
committer	TimePath <andrew.hardaker1995@gmail.com>
	Fri, 21 Aug 2015 06:11:52 +0000 (16:11 +1000)
commit	bc996d1cf2bb0de381c06a2ad07bed5d333e3e84
tree	8e93a1471099413293410e861475f80c47558fc8	tree \| snapshot
parent	adaa580f88d0a97498ea660d6f5cad095dc42dad	commit \| diff
parent	e500c4c3ae16913240d1bd0509e68510195f2872	commit \| diff

Merge branch 'master' into TimePath/issues/1490

# Conflicts:
# qcsrc/server/mutators/mutator_instagib.qc
# qcsrc/server/t_items.qc

12 files changed:

qcsrc/client/hud.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/monsters/monster/mage.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/physics.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/weapons/w_porto.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/cl_client.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/g_damage.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/miscfunctions.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/gamemode_ctf.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/gamemode_lms.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/mutator_instagib.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/mutator_nades.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/t_items.qc	diff1 \|	diff2 \|	blob \| history