de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit

author	samual <samual@samual-desktop.(none)>
	Thu, 20 May 2010 07:58:12 +0000 (03:58 -0400)
committer	samual <samual@samual-desktop.(none)>
	Thu, 20 May 2010 07:58:12 +0000 (03:58 -0400)
commit	59a4466589091544296dae7df539c76ca57bce06
tree	dd32d3fe98a8c323f6505598f18cd5eebc20eeff	tree \| snapshot
parent	427371dd10e4d9f307543e4e75051b89fd09e6b2	commit \| diff
parent	d9acf9dc3cf66812f7225317c56bc25fd5698d98	commit \| diff

Merge remote branch 'origin/master' into samual/balanceSamual

Conflicts:
balanceSamual.cfg