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/src/Main.hs
+++ b/src/Main.hs
@ -50,7 +50,7 @@ import           Graphics.GLUtil.BufferObjects        (offset0)

 import Graphics.Rendering.OpenGL.Raw.ARB.TessellationShader
 -- Our modules
-import           Map.Map
+import           Map.Graphics
 import           Render.Misc                          (checkError,
                                                       createFrustum, getCam,
                                                       curb, tryWithTexture,