External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-24 20:41:58 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions
mage/Mage.Server.Console/src
History
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
..
main Merge branch 'master' into Network_Upgrade 2015-06-20 23:00:34 -04:00
test/java/mage/server/console retrying without jars 2011-05-14 23:39:41 -04:00