github/mage
1
0
Fork 0
mirror of https://github.com/correl/mage.git synced 2024-12-29 03:00:15 +00:00
Code Issues Projects Releases Packages Wiki Activity
mage/Mage/src
History
Samuel Sandeen 6cf04e9bd2 Merge remote-tracking branch 'origin/master' 
# Conflicts:
#	Mage.Sets/src/mage/sets/gatecrash/Hindervines.java
#	Mage.Sets/src/mage/sets/timeshifted/Darkness.java
2016-07-10 19:01:20 -04:00
..
main Merge remote-tracking branch 'origin/master' 2016-07-10 19:01:20 -04:00
test/java/mage Some changes to mana handling to handle {C} mana. 2016-01-08 23:25:42 +01:00