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 5c829b79d5 Merge branch 'master' into Network_Upgrade 
Conflicts:
	Mage.Client/src/main/java/mage/client/dialog/PreferencesDialog.java
	Mage.Client/src/main/java/mage/client/game/GamePanel.java
	Mage.Client/src/main/java/mage/client/remote/CallbackClientImpl.java
	Mage.Server/src/main/java/mage/server/Session.java
	Mage.Server/src/main/java/mage/server/User.java
	Mage.Server/src/main/java/mage/server/game/GameController.java
	Mage.Server/src/main/java/mage/server/game/GameSessionPlayer.java
	Mage.Server/src/main/java/mage/server/game/GamesRoomImpl.java
2015-07-12 12:25:44 -04:00
..
main Merge branch 'master' into Network_Upgrade 2015-07-12 12:25:44 -04:00
test/java/mage/server/console retrying without jars 2011-05-14 23:39:41 -04:00