Merge branch 'tessallation' into Mapping

2014-03-05 15:10:17 +01:00 · 2014-03-05 15:10:17 +01:00 · 23f75f7ff1
commit 23f75f7ff1
parent e6c6442c85 1c1bd66d30
3 changed files with 2 additions and 4 deletions
--- a/1
+++ b/1
@ -1 +0,0 @@
-dist/build/Pioneers/Pioneers
--- a/BIN
+++ b/BIN
--- a/Pioneers.cabal
+++ b/Pioneers.cabal
@ -34,6 +34,5 @@ executable Pioneers
                   linear >=1.3.1 && <1.4,
                   lens >=3.10.1 && <3.11,
                   SDL2 >= 0.1.0,
-                   time >=1.4.0 && <1.5,
-                   fclabels >=2.0.0 && <3
+                   time >=1.4.0 && <1.5

--- a/src/Types.hs
+++ b/src/Types.hs
@ -9,7 +9,6 @@ import           Data.Time                            (UTCTime)
 import Linear.Matrix (M44)
 import Control.Monad.RWS.Strict (RWST)
 import Control.Lens
-import Data.Label


 --Static Read-Only-State