[commit: base] ghc-generics1: Merge branch 'master', remote-tracking branch 'origin' into ghc-generics1 (bf795f1)
José Pedro Magalhães <[email protected]>
| Newsgroups | gmane.comp.lang.haskell.cvs.libraries |
|---|---|
| Message-ID | <[email protected]> |
Repository : ssh://darcs.haskell.org//srv/darcs/packages/base On branch : ghc-generics1 http://hackage.haskell.org/trac/ghc/changeset/bf795f1099873854656b17042a64d9b8ce3eb7c3 >--------------------------------------------------------------- commit bf795f1099873854656b17042a64d9b8ce3eb7c3 Merge: 3ad8fff... 40d1be1... Author: Jose Pedro Magalhaes <[email protected]> Date: Fri Jun 8 11:16:04 2012 +0100 Merge branch 'master', remote-tracking branch 'origin' into ghc-generics1 Control/Concurrent.hs | 27 +++++++++++++-- GHC/TypeLits.hs | 2 +- System/IO.hs | 86 ++++++++++++++++++++++++++++++++++-------------- cbits/Win32Utils.c | 6 +++ 4 files changed, 91 insertions(+), 30 deletions(-)