Merge branch 'master' of https://github.com/evancz/Elm
commit6443ed9ae74e921431ecfc59dde7706e9dd5aa2f
authorevancz <info@elm-lang.org>
dateMon 17 Dec 2012, 20:46 (14 years ago)
parentfd536b9e9f5f0c
core-js/cat.shnew file+28
@@ -0,0 +1,28 @@
1+cat \
2+ Guid.js\
3+ foreign/JavaScript.js\
4+ foreign/JSON.js\
5+ Value.js\
6+ List.js\
7+ Maybe.js\
8+ Char.js\
9+ Graphics/Color.js\
10+ Graphics/Collage.js\
11+ Graphics/Element.js\
12+ Text.js\
13+ Graphics/Render.js\
14+ runtime/Signal.js\
15+ runtime/Dispatcher.js\
16+ Signal/HTTP.js\
17+ Signal/Input.js\
18+ Signal/Keyboard.js\
19+ Signal/Mouse.js\
20+ Signal/Random.js\
21+ Signal/Time.js\
22+ Signal/Window.js\
23+ Date.js\
24+ Prelude.js\
25+ Dict.js\
26+ Set.js\
27+ Automaton.js\
28+ > ../elm/elm-runtime.js
elm-server/elm-server.cabal+2−2
@@ -32,7 +32,7 @@ Executable elm-server
3232 parsec >= 3.1.1,
3333 blaze-html >= 0.5.1,
3434 HTTP >= 4000,
35− happstack-server == 7.0.2,
35+ happstack-server == 7.1.1,
3636 deepseq,
3737 filepath,
38− Elm >= 0.6.0.3
38+ Elm >= 0.6.0.3