Drezil/pioneers
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'tessallation' into lens

Browse Source 
Conflicts:
	Pioneers.cabal
	src/Main.hs
	src/Types.hs
This commit is contained in:
Nicole Dresselhaus 2014-02-28 14:47:04 +01:00
commit 82e9b4d826
1 changed files with 0 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/Types.hs
View File

@ -8,7 +8,6 @@ import Foreign.C (CFloat)
import Data.Time (UTCTime) import Data.Time (UTCTime)
import Linear.Matrix (M44) import Linear.Matrix (M44)
import Control.Monad.RWS.Strict (RWST) import Control.Monad.RWS.Strict (RWST)
--import Graphics.UI.SDL.TTF.Types as TTF
import Control.Lens import Control.Lens
import Data.Label import Data.Label