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

]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit - qcsrc/server/mutators/mutator/_mod.qh

author	terencehill <piuntn@gmail.com>
	Sun, 1 May 2016 07:56:58 +0000 (09:56 +0200)
committer	terencehill <piuntn@gmail.com>
	Sun, 1 May 2016 07:56:58 +0000 (09:56 +0200)
commit	2a38620bbb43f7b62bbd93e8c22b6abbe627ca86
tree	2c859e6691bc8a2defb255b48fb91abae6c11e5c	tree \| snapshot
parent	61d746760851b92ea6124dcc179c0f5178b62169	commit \| diff
parent	c914a05e8e91853fe003d7d03b1f3ddbf0881f39	commit \| diff

Merge branch 'master' into terencehill/dynamic_hud

defaultXonotic.cfg	diff1 \|	diff2 \|	blob \| history
qcsrc/client/autocvars.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/client/hud/panel/weapons.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/main.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/view.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/minigames/cl_minigames_hud.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/mutators/mutator/damagetext/damagetext.qc	diff1 \|	diff2 \|	blob \| history