evancz 989d878ac5 Merge branch 'master' into dev ... Conflicts: compiler/Model/Ast.hs compiler/Types/Constrain.hs		2013-06-06 22:36:14 -07:00
..
Ast.hs	Merge branch 'master' into dev	2013-06-06 22:36:14 -07:00
Guid.hs	Fix prelude imports and correctly generalize for library types that use Number.	2013-04-07 17:55:34 -07:00
Libraries.hs	Move Geometry into Collage. Get rid of Graphics prefix as appropriate.	2013-04-28 20:57:48 -07:00
LoadLibraries.hs	Revise elm-docs to copy the names of type variables in type annotations directly.	2013-05-04 18:19:54 -07:00
Located.hs	Add support for type annotations in let	2013-06-03 19:44:45 +12:00