betasteward b9c8a2598d Merge branch 'master' into Network_Upgrade ... Conflicts: Mage.Client/src/main/java/mage/client/draft/DraftPanel.java		2015-08-19 14:49:46 -04:00
..
src/mage	Merge branch 'master' into Network_Upgrade	2015-08-19 14:49:46 -04:00
manifest.mf
pom.xml	Xmage 1.4.3v0	2015-08-06 22:18:01 +02:00