fireshoes cda11b280c Merge origin/master		2015-06-22 18:47:51 -05:00
..
assembly	Release 1.4.0v2	2015-05-25 23:33:41 +02:00
java	Merge origin/master	2015-06-22 18:47:51 -05:00
resources	Added 12 Clash Pack promos, 5 judge promos, 2 upcoming FNM promos, renamed MerfolkToken to MerfolkWizardToken, added collector's number that were missing for ORI in mtg-cards-data.txt, added other various cards.	2015-06-22 18:46:01 -05:00