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: e3449b3 cbe4b5d)

author	unknown <jm@.(none)>
	Thu, 11 Nov 2010 22:12:00 +0000 (23:12 +0100)
committer	unknown <jm@.(none)>
	Thu, 11 Nov 2010 22:12:00 +0000 (23:12 +0100)
commit	50fae2ffe748fce0c54b20ef168a702f9607b8db
tree	055f2bb3c45d90b673c062b4c3d31b6b09699414	tree \| snapshot
parent	e3449b33968c2562dcb06287b4a06562de8dcb67	commit \| diff
parent	cbe4b5d591880e2df192dabe8043d7ff898520f1	commit \| diff

Merge remote branch 'origin/master' into tzork/balance-tzork

Conflicts:
balancetZork.cfg

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