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: 78d2c92 000100e)

author	FruitieX <fruitiex@gmail.com>
	Sun, 9 Jan 2011 01:06:24 +0000 (03:06 +0200)
committer	FruitieX <fruitiex@gmail.com>
	Sun, 9 Jan 2011 01:06:24 +0000 (03:06 +0200)
commit	40885be38d6c25f2840980fc7b8c437e52b49402
tree	f8ecb6c0793671ada8790cacb2099d2b1e837f68	tree \| snapshot
parent	78d2c92e265f2353adcad7f7cc4fd3798c90c1d0	commit \| diff
parent	000100e5a06711f313310a4c35468e00c222eb4e	commit \| diff

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

balance25.cfg	diff1 \|	diff2 \|	blob \| history
balanceLeeStricklin.cfg	diff1 \|	diff2 \|	blob \| history
balanceSamual.cfg	diff1 \|	diff2 \|	blob \| history
balanceXonotic.cfg	diff1 \|	diff2 \|	blob \| history
balancetZork.cfg	diff1 \|	diff2 \|	blob \| history
defaultXonotic.cfg	diff1 \|	diff2 \|	blob \| history
qcsrc/server/autocvars.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/server/g_damage.qc	diff1 \|	diff2 \|	blob \| history