External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-23 20:11:59 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions
mage/Mage.Network
History
betasteward 49558e091d Merge branch 'master' into Network_Upgrade 
Conflicts:
	Mage.Client/src/main/java/mage/client/dialog/ConnectDialog.java
	Mage.Client/src/main/java/mage/client/game/FeedbackPanel.java
	Mage.Client/src/main/java/mage/client/game/GamePanel.java
	Mage.Server/src/main/java/mage/server/game/GameSessionPlayer.java
2015-09-10 10:30:51 -04:00
..
src/main/java/org/mage/network added getCards method - fixes update database issue 2015-09-03 16:05:53 -04:00
pom.xml Merge branch 'master' into Network_Upgrade 2015-09-10 10:30:51 -04:00