Viewing all changes in revision 7263.
- Committer: fios at foramnagaidhlig
- Date: 2014-11-23 11:38:50 UTC
- mfrom: (7254.1.19 trunk)
- Revision ID: fios@foramnagaidhlig.net-20141123113850-5ysqhvcf19cdi7wb
Merged trunk.
- files added:
- maps/Atoll.wmf/minimap.png
- files removed:
- src/ui_basic/is_printable.cc
- files modified:
- CMakeLists.txt
expand all
collapse all
added
removed
maps/Atoll.wmf/minimap.png
maps/Calvisson.wmf/minimap.png
maps/Checkmate.wmf/minimap.png
maps/Comet Island.wmf/minimap.png
maps/Crater.wmf/minimap.png
maps/Crossing the horizon.wmf/minimap.png
maps/Desert Tournament.wmf/minimap.png
maps/Dry Riverbed.wmf/minimap.png
maps/Elven Forests.wmf/minimap.png
maps/Fellowships.wmf/minimap.png
maps/Finlakes.wmf/minimap.png
maps/Firegames.wmf/minimap.png
maps/Four Castles.wmf/minimap.png
maps/Four Mountains.wmf/minimap.png
maps/Glacier Lake.wmf/minimap.png
maps/Golden Peninsula.wmf/minimap.png
maps/Ice wars.wmf/minimap.png
maps/Impact.wmf/minimap.png
maps/Islands at war.wmf/minimap.png
maps/Kings and Queens.wmf/minimap.png
maps/Lake of tranquility.wmf/minimap.png
maps/Last Bastion.wmf/minimap.png
maps/Long, long way.wmf/minimap.png
maps/MP Scenarios/Island Hopping.wmf/minimap.png
maps/MP Scenarios/Smugglers.wmf/minimap.png
maps/Mystical Maze.wmf/minimap.png
maps/Plateau.wmf/minimap.png
maps/Rendez-Vous.wmf/minimap.png
maps/River Explorers.wmf/minimap.png
maps/Riverlands.wmf/minimap.png
maps/Sun of fire.wmf/minimap.png
maps/Swamp Island.wmf/minimap.png
maps/Swamp Monks.wmf/minimap.png
maps/The Far North.wmf/minimap.png
maps/The Nile.wmf/minimap.png
maps/The Oasis Triangle.wmf/minimap.png
maps/The Thaw.wmf/minimap.png
maps/The big lake.wmf/minimap.png
maps/The long way.wmf/minimap.png
maps/The pass through the mountains.wmf/minimap.png
maps/Three Warriors.wmf/minimap.png
maps/Together we're strong.wmf/minimap.png
maps/Trident of Fire.wmf/minimap.png
maps/Twin Lagoons.wmf/minimap.png
maps/Twinkling Waves.wmf/minimap.png
maps/Two frontiers.wmf/minimap.png
maps/Volcanic Winter.wmf/minimap.png
maps/War of the Valleys.wmf/minimap.png
maps/Wisent Valley.wmf/minimap.png
