mage/Mage.Server.Console
betasteward f4aff4a121 Merge branch 'master' into Network_Upgrade
Conflicts:
	Mage.Client/src/main/java/mage/client/chat/ChatPanel.java
	Mage.Client/src/main/java/mage/client/dialog/PreferencesDialog.java
	Mage.Client/src/main/java/mage/client/table/TablesPanel.java
	Mage.Common/src/mage/remote/SessionImpl.java
	Mage.Server/src/main/java/mage/server/Session.java
2015-06-20 23:00:34 -04:00
..
src Merge branch 'master' into Network_Upgrade 2015-06-20 23:00:34 -04:00
pom.xml Merge branch 'master' into Network_Upgrade 2015-06-20 23:00:34 -04:00