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.Server
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
..
config Merge branch 'master' into Network_Upgrade 2015-09-10 10:30:51 -04:00
release Merge branch 'master' into Network_Upgrade 2015-09-10 10:30:51 -04:00
src/main Merge branch 'master' into Network_Upgrade 2015-09-10 10:30:51 -04:00
catalog.xml Initial 2010-03-20 03:44:53 +00:00
license.txt ... 2010-03-20 17:39:52 +00:00
manifest.mf Initial 2010-03-20 03:44:53 +00:00
pom.xml Merge branch 'master' into Network_Upgrade 2015-09-10 10:30:51 -04:00
server.msg.txt Xmage 1.4.3v0 2015-08-06 23:11:36 +02:00