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: 2da1811 a73c41d)

author	unknown <jm@.(none)>
	Wed, 10 Nov 2010 00:04:44 +0000 (01:04 +0100)
committer	unknown <jm@.(none)>
	Wed, 10 Nov 2010 00:04:44 +0000 (01:04 +0100)
commit	d4a496548f33a19bae54c700639079dcf453dde1
tree	939d196e83573e45b47e203136c10f645171a546	tree \| snapshot
parent	2da1811b47a472ed139e157fd9bd665e1027ddea	commit \| diff
parent	a73c41d6a3525f42bb3c6850123448ee7faa9c09	commit \| diff

Merge remote branch 'origin/divVerent/crylink-joinspeed' into tzork/balance-tzork

balance25.cfg	diff1 \|	diff2 \|	blob \| history
balanceLeeStricklin.cfg	diff1 \|	diff2 \|	blob \| history
balanceNexSVN.cfg	diff1 \|	diff2 \|	blob \| history
balanceSamual.cfg	diff1 \|	diff2 \|	blob \| history
balanceTest.cfg	diff1 \|	diff2 \|	blob \| history
balanceXonotic.cfg	diff1 \|	diff2 \|	blob \| history
balancetZork.cfg	diff1 \|	diff2 \|	blob \| history