Merge branch 'master' of https://github.com/evancz/Elm
Conflicts:
Examples/elm-js/Pong/Pong.elm
commit53c621bd72d0f633dc7faf94d28429befe521299
authorevancz <info@elm-lang.org>
dateSat 18 Aug 2012, 13:34 (14 years ago)
parent595ed383f6843d
Examples/elm-js/Pong/Pong.elm+1−1
@@ -1,5 +1,5 @@
11
2−{-----------------------------------------------------------------------
2+{----- Overview ------------------------------------------------------
33
44 This game displays some of the strengths of Functional Reactive
55 Programming (FRP). By the end of this file we will have written an