Merged up to current

Browse source

...

This commit is contained in:

Mark Langen 2016-09-01 15:44:14 -06:00

parent 818efb8535 0c89b81da0

commit 463576dbd0

220 changed files with 68405 additions and 29458 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

1586

Mage.Common/src/mage/view/CardView.java

View file

File diff suppressed because it is too large Load diff