LevelX2 c591e4b75a Merge commit 'ae8ada286c' into Network_Upgrade ... Conflicts: Mage.Common/src/mage/view/CardView.java		2015-09-13 18:03:07 +02:00
..
src/mage	Merge commit 'ae8ada286c' into Network_Upgrade	2015-09-13 18:03:07 +02:00
manifest.mf
pom.xml	Xmage 1.4.4v0	2015-09-05 12:51:07 +02:00