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: 994e2e0 c445450)

author	unknown <jm@.(none)>
	Thu, 11 Nov 2010 00:05:50 +0000 (01:05 +0100)
committer	unknown <jm@.(none)>
	Thu, 11 Nov 2010 00:05:50 +0000 (01:05 +0100)
commit	ff35e838d3cfa0162951d604d213e48aeb771e80
tree	baed5e6019716d89555ffb9fd772237deff659c6	tree \| snapshot
parent	994e2e010d2ca496b8fb6bdafcd0b6824d97e20f	commit \| diff
parent	c445450d257558c3426fc87a1d95fab4d03ce0a9	commit \| diff

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

Conflicts:
balancetZork.cfg
qcsrc/server/w_crylink.qc

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
qcsrc/server/cl_client.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/defs.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/server/w_crylink.qc	diff1 \|	diff2 \|	blob \| history