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

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

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

summary | shortlog | log | commit | commitdiff | tree
(merge: a629d43 2855161)

author	Samual <samual@xonotic.org>
	Wed, 26 Oct 2011 13:06:25 +0000 (09:06 -0400)
committer	Samual <samual@xonotic.org>
	Wed, 26 Oct 2011 13:06:25 +0000 (09:06 -0400)
commit	1c62f7a27b54573d6f25a6b936026c549df2c6ef
tree	18719b794f686315791a7ed92b9f238fb54bc120	tree \| snapshot
parent	a629d4364d43ac5a8eccc9f1a360c0c5362520a8	commit \| diff
parent	2855161bde224eeb01bcffd654d726c3ba0cf73b	commit \| diff

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

defaultXonotic.cfg	diff1 \|	diff2 \|	blob \| history
qcsrc/client/Main.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/View.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/autocvars.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/server/autocvars.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/server/w_uzi.qc	diff1 \|	diff2 \|	blob \| history