Commit Graph

4 Commits

Author SHA1 Message Date
82e9b4d826 Merge branch 'tessallation' into lens
Conflicts:
	Pioneers.cabal
	src/Main.hs
	src/Types.hs
2014-02-28 14:47:04 +01:00
517f2eb0b6 removed SDL-ttf as it breaks for now 2014-02-28 14:44:58 +01:00
d5310478c0 converted Types to Labels
- Types is converted to Lebles (monomorphic lenses)
- Main initializes type now
- All other stuff in Main still calls old syntax.

refs #467 @3h
2014-02-23 13:32:20 +01:00
95a7a5b9f1 forgot files -.- 2014-02-05 21:06:19 +01:00