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

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

projects / xonotic / xonotic-data.pk3dir.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: cf7a331 a73dd06)

author	Samual Lenks <samual@xonotic.org>
	Mon, 17 Feb 2014 03:39:19 +0000 (22:39 -0500)
committer	Samual Lenks <samual@xonotic.org>
	Mon, 17 Feb 2014 03:39:19 +0000 (22:39 -0500)
commit	8956fac358b1f67619049037f188cbffd6fe1b36
tree	ee1359d753f7da9595cde530fa09b286a28dd019	tree \| snapshot
parent	cf7a331d601d523ba73796e41f3b5dc6620bb8a7	commit \| diff
parent	a73dd06468dfdc517fc6ff801ba8cf251dcd74b6	commit \| diff

Merge remote-tracking branch 'origin/master' into samual/weapons

Conflicts:
qcsrc/server/mutators/mutator_melee_only.qc

defaultXonotic.cfg	diff1 \|	diff2 \|	blob \| history
qcsrc/common/notifications.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/common/util.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/util.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/server/autocvars.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/server/cl_client.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/cl_player.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/mutators/mutator_melee_only.qc	diff1 \|	diff2 \|	blob \| history