Merge branch 'master' of ssh://109.200.159.85/var/lib/git/mage

Browse source

Conflicts:
	Mage.Server/plugins/mage-player-ai-ma.jar
	Mage.Server/plugins/mage-player-ai.jar
	Mage.Server/plugins/mage-player-aimcts.jar
	Mage.Server/plugins/mage-player-aiminimax.jar
	Mage.Server/plugins/mage-player-human.jar
	Mage.Tests/plugins/mage-player-ai-ma.jar
	Mage.Tests/plugins/mage-player-ai.jar

...

This commit is contained in:

BetaSteward 2012-02-02 23:40:49 -05:00

parent e6d38e6558 0ef737fe20

commit c2da5df068

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

Diff content is not available