Commit 4caf05aa authored by myk's avatar myk

merge latest trunk

parents 822ef8db 2eca4da8
......@@ -12459,290 +12459,6 @@ res/lists/quest-pet-shop-icons.txt svneol=native#text/plain
res/lists/quest-pet-token-images.txt svneol=native#text/plain
res/lists/token-images.txt svneol=native#text/plain
res/lists/tournamentpack-images.txt svneol=native#text/plain
res/pics_product/booster/10E.png -text
res/pics_product/booster/5DN.png -text
res/pics_product/booster/7E.png -text
res/pics_product/booster/8ED.png -text
res/pics_product/booster/9ED.png -text
res/pics_product/booster/ALA.png -text
res/pics_product/booster/AP.png -text
res/pics_product/booster/ARB.png -text
res/pics_product/booster/AVR.png -text
res/pics_product/booster/BOK.png -text
res/pics_product/booster/CFX.png -text
res/pics_product/booster/CHK.png -text
res/pics_product/booster/CSP.png -text
res/pics_product/booster/DIS.png -text
res/pics_product/booster/DKA.png -text
res/pics_product/booster/DPA.png -text
res/pics_product/booster/DST.png -text
res/pics_product/booster/EVE.png -text
res/pics_product/booster/EX.png -text
res/pics_product/booster/FUT.png -text
res/pics_product/booster/GPT.png -text
res/pics_product/booster/GTC.png -text
res/pics_product/booster/IN.png -text
res/pics_product/booster/ISD.png -text
res/pics_product/booster/JUD.png -text
res/pics_product/booster/LGN.png -text
res/pics_product/booster/LRW.png -text
res/pics_product/booster/M10.png -text
res/pics_product/booster/M11.png -text
res/pics_product/booster/M12.png -text
res/pics_product/booster/M13.png -text
res/pics_product/booster/MBS.png -text
res/pics_product/booster/MI.png -text
res/pics_product/booster/MOR.png -text
res/pics_product/booster/MRD.png -text
res/pics_product/booster/NPH.png -text
res/pics_product/booster/OD.png -text
res/pics_product/booster/ONS.png -text
res/pics_product/booster/PLC.png -text
res/pics_product/booster/PS.png -text
res/pics_product/booster/RAV.png -text
res/pics_product/booster/ROE.png -text
res/pics_product/booster/RTR.png -text
res/pics_product/booster/SCG.png -text
res/pics_product/booster/SHM.png -text
res/pics_product/booster/SOK.png -text
res/pics_product/booster/SOM.png -text
res/pics_product/booster/ST.png -text
res/pics_product/booster/TE.png -text
res/pics_product/booster/TOR.png -text
res/pics_product/booster/TSP.png -text
res/pics_product/booster/UD.png -text
res/pics_product/booster/UL.png -text
res/pics_product/booster/UZ.png -text
res/pics_product/booster/VI.png -text
res/pics_product/booster/WL.png -text
res/pics_product/booster/WWK.png -text
res/pics_product/booster/ZEN.png -text
res/pics_product/fatpacks/10E.jpg -text
res/pics_product/fatpacks/5DN.jpg -text
res/pics_product/fatpacks/9ED.jpg -text
res/pics_product/fatpacks/ALA.jpg -text
res/pics_product/fatpacks/APC.jpg -text
res/pics_product/fatpacks/ARB.jpg -text
res/pics_product/fatpacks/AVR.png -text
res/pics_product/fatpacks/BOK.jpg -text
res/pics_product/fatpacks/CFX.jpg -text
res/pics_product/fatpacks/CHK.jpg -text
res/pics_product/fatpacks/CSP.jpg -text
res/pics_product/fatpacks/DIS.jpg -text
res/pics_product/fatpacks/DKA.jpg -text
res/pics_product/fatpacks/DST.jpg -text
res/pics_product/fatpacks/EVE.jpg -text
res/pics_product/fatpacks/FUT.jpg -text
res/pics_product/fatpacks/GPT.jpg -text
res/pics_product/fatpacks/GTC.jpg -text
res/pics_product/fatpacks/INV.jpg -text
res/pics_product/fatpacks/ISD.jpg -text
res/pics_product/fatpacks/JUD.jpg -text
res/pics_product/fatpacks/LGN.jpg -text
res/pics_product/fatpacks/LRW.jpg -text
res/pics_product/fatpacks/M10.jpg -text
res/pics_product/fatpacks/M10.png -text
res/pics_product/fatpacks/M11.jpg -text
res/pics_product/fatpacks/M11.png -text
res/pics_product/fatpacks/M12.jpg -text
res/pics_product/fatpacks/M12.png -text
res/pics_product/fatpacks/M13.jpg -text
res/pics_product/fatpacks/MBS.jpg -text
res/pics_product/fatpacks/MMQ.jpg -text
res/pics_product/fatpacks/MOR.jpg -text
res/pics_product/fatpacks/MRD.jpg -text
res/pics_product/fatpacks/NMS.jpg -text
res/pics_product/fatpacks/NPH.jpg -text
res/pics_product/fatpacks/ODY.jpg -text
res/pics_product/fatpacks/ONS.jpg -text
res/pics_product/fatpacks/PCY.jpg -text
res/pics_product/fatpacks/PLC.jpg -text
res/pics_product/fatpacks/PLS.JPG -text
res/pics_product/fatpacks/RAV.jpg -text
res/pics_product/fatpacks/ROE.jpg -text
res/pics_product/fatpacks/RTR.jpg -text
res/pics_product/fatpacks/SCG.jpg -text
res/pics_product/fatpacks/SHM.jpg -text
res/pics_product/fatpacks/SOK.jpg -text
res/pics_product/fatpacks/SOM.jpg -text
res/pics_product/fatpacks/TOR.jpg -text
res/pics_product/fatpacks/TSP.jpg -text
res/pics_product/fatpacks/WWK.jpg -text
res/pics_product/fatpacks/ZEN.jpg -text
res/pics_product/precons/Bait_Bludgeon.jpg -text
res/pics_product/precons/Battle_Surge.jpg -text
res/pics_product/precons/Boggart_Feast.jpg -text
res/pics_product/precons/Bomber.jpg -text
res/pics_product/precons/Cho_Mannos_Resolve.jpg -text
res/pics_product/precons/Code_of_the_Orzhov.jpg -text
res/pics_product/precons/Critical_Mass.jpg -text
res/pics_product/precons/Crusher.jpg -text
res/pics_product/precons/Custom_Creatures.jpg -text
res/pics_product/precons/Dead_Again.jpg -text
res/pics_product/precons/Deaths_Minions.jpg -text
res/pics_product/precons/Decay.jpg -text
res/pics_product/precons/Deep_Freeze.jpg -text
res/pics_product/precons/Disrupter.jpg -text
res/pics_product/precons/Domain.jpg -text
res/pics_product/precons/Elvish_Rage.jpg -text
res/pics_product/precons/Evincars_Tyranny.jpg -text
res/pics_product/precons/Expulsion.jpg -text
res/pics_product/precons/Fangs_of_the_Bloodchief.jpg -text
res/pics_product/precons/Fate_Blaster.jpg -text
res/pics_product/precons/Fiendish_Nature.jpg -text
res/pics_product/precons/Golgari_Deathcreep.jpg -text
res/pics_product/precons/Golgari_Growth.jpg -text
res/pics_product/precons/Grave_Danger.jpg -text
res/pics_product/precons/Groundbreaker.jpg -text
res/pics_product/precons/Heavy_Hitters.jpg -text
res/pics_product/precons/Infestation.jpg -text
res/pics_product/precons/Izzet_Ingenuity.jpg -text
res/pics_product/precons/Kamahls_Temper.jpg -text
res/pics_product/precons/Kami_Reborn.jpg -text
res/pics_product/precons/Kithkin_Militia.jpg -text
res/pics_product/precons/Legion_Aloft.jpg -text
res/pics_product/precons/Life_Boost.jpg -text
res/pics_product/precons/Little_Bashers.jpg -text
res/pics_product/precons/Lofty_Heights.jpg -text
res/pics_product/precons/Master_Blaster.jpg -text
res/pics_product/precons/Mercenaries.jpg -text
res/pics_product/precons/Merrow_Riverways.jpg -text
res/pics_product/precons/Migraine.jpg -text
res/pics_product/precons/Molimos_Might.jpg -text
res/pics_product/precons/Phyrexian_Assault.jpg -text
res/pics_product/precons/Pummel.jpg -text
res/pics_product/precons/Radiants_Revenge.jpg -text
res/pics_product/precons/Rakdos_Bloodsport.jpg -text
res/pics_product/precons/Rakdos_Raid.jpg -text
res/pics_product/precons/Replicator.jpg -text
res/pics_product/precons/Rituals_of_Rebirth.jpg -text
res/pics_product/precons/Sacrificial_Bam.jpg -text
res/pics_product/precons/Selesnya_Surge.jpg -text
res/pics_product/precons/Selesnya_United.jpg -text
res/pics_product/precons/Shamanism.jpg -text
res/pics_product/precons/Sky_Slam.jpg -text
res/pics_product/precons/Sleeper.jpg -text
res/pics_product/precons/Sliver_Shivers.jpg -text
res/pics_product/precons/Snowscape.jpg -text
res/pics_product/precons/Spectral_Slam.jpg -text
res/pics_product/precons/Speed_Scorch.jpg -text
res/pics_product/precons/Spirit_Flames.jpg -text
res/pics_product/precons/Spiritcraft.jpg -text
res/pics_product/precons/Stampede.jpg -text
res/pics_product/precons/Sunburst.jpg -text
res/pics_product/precons/The_Spikes.jpg -text
res/pics_product/precons/The_Swarm.jpg -text
res/pics_product/precons/Time_Drain.jpg -text
res/pics_product/precons/Tombstone.jpg -text
res/pics_product/precons/Trounce-O-Matic.jpg -text
res/pics_product/precons/Truth_Seekers.jpg -text
res/pics_product/precons/Turnabout.jpg -text
res/pics_product/precons/Warriors_Code.jpg -text
res/pics_product/precons/Way_Wild.jpg -text
res/pics_product/precons/Wicked_Big.jpg -text
res/pics_product/precons/World_Aflame.jpg -text
res/pics_product/precons/Zombies_Unleashed.jpg -text
res/pics_product/precons/angelic_might.jpg -text
res/pics_product/precons/bant_exalted.jpg -text
res/pics_product/precons/bant_on_the_march.jpg -text
res/pics_product/precons/battle_blitz.jpg -text
res/pics_product/precons/battle_cries.jpg -text
res/pics_product/precons/blood_and_fire.jpg -text
res/pics_product/precons/bound_by_strength.jpg -text
res/pics_product/precons/breath_of_fire.jpg -text
res/pics_product/precons/carnival_of_blood.jpg -text
res/pics_product/precons/dark_sacrifice.jpg -text
res/pics_product/precons/dead_ahead.jpg -text
res/pics_product/precons/deadspread.jpg -text
res/pics_product/precons/deathfed.jpg -text
res/pics_product/precons/deathly_dominion.jpg -text
res/pics_product/precons/deaths_encroach.jpg -text
res/pics_product/precons/depths_of_power.jpg -text
res/pics_product/precons/devouring_skies.jpg -text
res/pics_product/precons/doom_inevitable.jpg -text
res/pics_product/precons/eldritch_onslaught.jpg -text
res/pics_product/precons/entangling_webs.jpg -text
res/pics_product/precons/esper_air_assault.jpg -text
res/pics_product/precons/esper_artifice.jpg -text
res/pics_product/precons/eternal_siege.jpg -text
res/pics_product/precons/feast_of_flesh.jpg -text
res/pics_product/precons/fiery_dawn.jpg -text
res/pics_product/precons/firebomber.jpg -text
res/pics_product/precons/flyover.jpg -text
res/pics_product/precons/gleeful_flames.jpg -text
res/pics_product/precons/grab-for-power.jpg -text
res/pics_product/precons/grave_power.jpg -text
res/pics_product/precons/grixis_shambling_army.jpg -text
res/pics_product/precons/grixis_undead.jpg -text
res/pics_product/precons/hold_the_line.jpg -text
res/pics_product/precons/infect_and_defile.jpg -text
res/pics_product/precons/into_the_breach.jpg -text
res/pics_product/precons/invading_spawn.jpg -text
res/pics_product/precons/jund_appetite_for_war.jpg -text
res/pics_product/precons/kor_armory.jpg -text
res/pics_product/precons/levelers_glory.jpg -text
res/pics_product/precons/levelers_scorn.jpg -text
res/pics_product/precons/metalcraft.jpg -text
res/pics_product/precons/mirromancy.jpg -text
res/pics_product/precons/mob_rule.jpg -text
res/pics_product/precons/monstrous_surprise.jpg -text
res/pics_product/precons/myr_of_mirrodin.jpg -text
res/pics_product/precons/mysterious_realms.jpg -text
res/pics_product/precons/mystical_might.jpg -text
res/pics_product/precons/naya_behemoths.jpg -text
res/pics_product/precons/naya_domain.jpg -text
res/pics_product/precons/path_of_blight.jpg -text
res/pics_product/precons/phyrexian_poison.jpg -text
res/pics_product/precons/presence_of_mind.jpg -text
res/pics_product/precons/primordial_jund.jpg -text
res/pics_product/precons/rapid_fire.jpg -text
res/pics_product/precons/ravaging_swarm.jpg -text
res/pics_product/precons/reign_of_vampirism.jpg -text
res/pics_product/precons/relentless_dead.jpg -text
res/pics_product/precons/relic_breaker.jpg -text
res/pics_product/precons/repeat_performance.jpg -text
res/pics_product/precons/repel_the_dark.jpg -text
res/pics_product/precons/rise_of_the_vampires.jpg -text
res/pics_product/precons/rot_from_within.jpg -text
res/pics_product/precons/rumbler.jpg -text
res/pics_product/precons/sacred_assault.jpg -text
res/pics_product/precons/slaughterhouse.jpg -text
res/pics_product/precons/sole_domination.jpg -text
res/pics_product/precons/solitary_fiends.jpg -text
res/pics_product/precons/spectral_legions.jpg -text
res/pics_product/precons/spiraling_doom.jpg -text
res/pics_product/precons/superabundance.jpg -text
res/pics_product/precons/sweet_revenge.jpg -text
res/pics_product/precons/swift_justice.jpg -text
res/pics_product/precons/the_adventurers.jpg -text
res/pics_product/precons/totem_power.jpg -text
res/pics_product/precons/unnatural_schemes.jpg -text
res/pics_product/precons/unstable_terrain.jpg -text
res/pics_product/precons/vampire_onslaught.jpg -text
res/pics_product/precons/war_of_attrition.jpg -text
res/pics_product/precons/wild_rush.jpg -text
res/pics_product/tournamentpacks/2ED.jpg -text
res/pics_product/tournamentpacks/3ED.jpg -text
res/pics_product/tournamentpacks/4ED.jpg -text
res/pics_product/tournamentpacks/5ED.jpg -text
res/pics_product/tournamentpacks/6ED.jpg -text
res/pics_product/tournamentpacks/ALA.jpg -text
res/pics_product/tournamentpacks/CHK.jpg -text
res/pics_product/tournamentpacks/ICE.jpg -text
res/pics_product/tournamentpacks/INV.jpg -text
res/pics_product/tournamentpacks/LEA.jpg -text
res/pics_product/tournamentpacks/LEB.jpg -text
res/pics_product/tournamentpacks/LRW.jpg -text
res/pics_product/tournamentpacks/MIR.jpg -text
res/pics_product/tournamentpacks/MMQ.jpg -text
res/pics_product/tournamentpacks/MRD.jpg -text
res/pics_product/tournamentpacks/ODY.jpg -text
res/pics_product/tournamentpacks/ONS.jpg -text
res/pics_product/tournamentpacks/RAV.jpg -text
res/pics_product/tournamentpacks/SHM.jpg -text
res/pics_product/tournamentpacks/TMP.jpg -text
res/pics_product/tournamentpacks/TSP.jpg -text
res/pics_product/tournamentpacks/USG.jpg -text
res/quest/all-prices.txt svneol=native#text/plain
res/quest/bazaar/ape_pet_l1.txt -text
res/quest/bazaar/ape_pet_l2.txt -text
......
......@@ -8,12 +8,6 @@
/pom.xml.releaseBackup
/pom.xml.tag
/release.properties
res/pics_product/*
res/pics_product/booster/*
res/pics_product/fatpacks/*
res/pics_product/precons/*
res/pics_product/tournamentpacks/*
res/quest/data
/target
tools/PerSetTrackingResults
tools/oracleScript.log
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment