github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-11-17 19:19:32 +00:00
Code Issues Projects Releases Packages Wiki Activity
mage/Mage/src/main
History
Ludwig.Hirth a175ac3a1d Merge origin/master 
Conflicts:
	Mage.Sets/src/mage/cards/c/CogworkAssembler.java
2017-01-19 17:01:34 +01:00
..
java/mage Merge origin/master 2017-01-19 17:01:34 +01:00
proto specify proto2 syntax 2016-11-05 11:26:30 -07:00