]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge remote branch 'origin/master' into samual/balancesamual
authorSamual <samual@xonotic.org>
Mon, 7 Feb 2011 07:55:19 +0000 (02:55 -0500)
committerSamual <samual@xonotic.org>
Mon, 7 Feb 2011 07:55:19 +0000 (02:55 -0500)
commitd8cc6c8edabb08c081f23dcf0cd3883d87f9e0f4
treee3e47147152a305a96dbceafb3a2933a8721945e
parent6a6a89773a1f371bb031f83dc7df98c71e2e446c
parent667fe966bfa2514cfa139858b77ab75fc48b2897
Merge remote branch 'origin/master' into samual/balancesamual

Conflicts:
balanceXonotic.cfg
balanceXonotic.cfg
qcsrc/server/autocvars.qh