evancz 989d878ac5 Merge branch 'master' into dev ... Conflicts: compiler/Model/Ast.hs compiler/Types/Constrain.hs		2013-06-06 22:36:14 -07:00
..
Alias.hs	Add support for type annotations in let	2013-06-03 19:44:45 +12:00
Constrain.hs	Merge branch 'master' into dev	2013-06-06 22:36:14 -07:00
Hints.hs	Clean up imports in many files.	2013-05-28 06:47:36 -07:00
Solver.hs	Switch name of Context to Located. Whoo static types :)	2013-05-29 16:20:38 -07:00
Substitutions.hs	Support @ patterns as in Haskell	2013-06-06 21:27:20 +12:00
Types.hs	Add support for type annotations in let	2013-06-03 19:44:45 +12:00
Unify.hs	Clean up imports in many files.	2013-05-28 06:47:36 -07:00