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

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

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

summary | shortlog | log | commit | commitdiff | tree
(merge: f128a72 0eb9323)

author	Samual <samual@xonotic.org>
	Mon, 7 Mar 2011 01:07:06 +0000 (20:07 -0500)
committer	Samual <samual@xonotic.org>
	Mon, 7 Mar 2011 01:07:06 +0000 (20:07 -0500)
commit	c26bfcd90d4ebc2d4e3aaf58f46f77e3ce49fb79
tree	176902f3e0367eb457afb2076658e3c61943ac7d	tree \| snapshot
parent	f128a72f566a5e3756059ad29b5a07048334bdd1	commit \| diff
parent	0eb9323ff6b61aae95adfaf25187dc78bc4c66b0	commit \| diff

Merge remote branch 'origin/master' into samual/lightning_gun

qcsrc/client/Defs.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/Main.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/hud.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/constants.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/server/cl_client.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/g_world.qc	diff1 \|	diff2 \|	blob \| history