Merge remote-tracking branch 'origin/Mapping' into tessallation

Conflicts: Pioneers.cabal
2014-04-05 23:12:33 +02:00
parent 26903deb19 4ffab54d04
commit 38d807b9b1
7 changed files with 220 additions and 31 deletions
--- a/Pioneers.cabal
+++ b/Pioneers.cabal
@ -12,7 +12,10 @@ executable Pioneers
    ghc-options:     -Wall -Odph -rtsopts -threaded -fno-liberate-case -funfolding-use-threshold1000 -funfolding-keeness-factor1000 -optlo-O3 -fllvm
  }
  other-module
-                   Map.Map,
+                   Map.Types,
+                   Map.Graphics,
+                   Map.Creation,
+                   Map.StaticMaps,
                   Render.Misc,
                   Render.Render,
                   Render.RenderObject,