betasteward d9f1d71d98 Merge branch 'master' into Network_Upgrade ... Conflicts: Mage.Client/src/main/java/mage/client/plugins/adapters/MageActionCallback.java Mage.Client/src/main/java/mage/client/table/TablesPanel.java Mage.Common/src/mage/view/CardView.java		2015-08-17 09:20:44 -04:00
..
src/main/java/org/mage/network	improved disconnect handling	2015-08-17 08:47:19 -04:00
pom.xml	Merge branch 'master' into Network_Upgrade	2015-08-17 09:20:44 -04:00