External/mage
1
0
Fork 1
mirror of https://github.com/magefree/mage.git synced 2025-12-24 12:31:59 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions
mage/Mage
History
LevelX2 ad9f325b72 Merge origin/master into Network_Upgrade 
Conflicts:
	Mage.Client/src/main/java/mage/client/MageFrame.java
	Mage.Client/src/main/java/mage/client/dialog/PreferencesDialog.java
	Mage.Common/src/mage/view/UserDataView.java
2015-08-27 15:23:31 +02:00
..
src/mage Merge origin/master into Network_Upgrade 2015-08-27 15:23:31 +02:00
manifest.mf
pom.xml Xmage 1.4.3v0 2015-08-06 22:18:01 +02:00