Merge branch 'tessallation' into lens

Conflicts: Pioneers.cabal src/Main.hs src/Types.hs
2014-02-28 14:47:04 +01:00 · 2014-02-28 14:47:04 +01:00 · 82e9b4d826
commit 82e9b4d826
parent d5310478c0 517f2eb0b6
1 changed files with 0 additions and 1 deletions
--- a/src/Types.hs
+++ b/src/Types.hs
@ -8,7 +8,6 @@ import           Foreign.C                            (CFloat)
 import           Data.Time                            (UTCTime)
 import Linear.Matrix (M44)
 import Control.Monad.RWS.Strict (RWST)
--import Graphics.UI.SDL.TTF.Types as TTF
 import Control.Lens
 import Data.Label