Merge branch 'master' of https://github.com/bmsherman/Idris-dev
Conflicts:
libs/prelude/Prelude/Applicative.idr
libs/prelude/Prelude/Bool.idr
libs/prelude/Prelude/Foldable.idr
libs/prelude/Prelude/Maybe.idr
commit0e31481519602fe8ea49465a8b2ef2fa958551ac
authorbmsherman <bmsherman@users.noreply.github.com>
dateFri 2 May 2014, 07:01 (12 years ago)
parent2a603e4475eb57