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
12403 commits 38 branches 229 tags 960 MiB
Commit graph

4 commits

Author SHA1 Message Date
betasteward
d9f1d71d98 Merge branch 'master' into Network_Upgrade 
Conflicts:
	Mage.Client/src/main/java/mage/client/plugins/adapters/MageActionCallback.java
	Mage.Client/src/main/java/mage/client/table/TablesPanel.java
	Mage.Common/src/mage/view/CardView.java
 2015-08-17 09:20:44 -04:00
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
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
betasteward
e45345d87a initial commit - only table pane chat is working atm 2015-05-23 10:18:36 -04:00