[commit: base] new-typeable: Merge branch 'master' of /home/dreixel/repos/ghc/libraries/base (281d906)

[José Pedro Magalhães]

Repository : ssh://darcs.haskell.org//srv/darcs/packages/base

On branch  : new-typeable

http://hackage.haskell.org/trac/ghc/changeset/281d90658a4751302464ec3f311ebdaa0cabbb62

>---------------------------------------------------------------

commit 281d90658a4751302464ec3f311ebdaa0cabbb62
Merge: f9c469e... 62c6793...
Author: Jose Pedro Magalhaes <jpm at cs.ox.ac.uk>
Date:   Tue Nov 20 09:29:39 2012 +0000

    Merge branch 'master' of /home/dreixel/repos/ghc/libraries/base

 Control/Exception.hs      |    7 ++
 Control/Exception/Base.hs |    5 --
 Data/Foldable.hs          |    2 +-
 Foreign/C/Types.hs        |    8 +-
 Foreign/Marshal/Pool.hs   |    2 +-
 GHC/Arr.lhs               |    4 +-
 GHC/Base.lhs              |   13 +---
 GHC/Exts.hs               |    1 -
 GHC/IO/Exception.hs       |    6 +-
 GHC/IO/FD.hs              |    2 +-
 GHC/List.lhs              |    2 +-
 GHC/Read.lhs              |   16 ++--
 GHC/TypeLits.hs           |    5 ++
 GHC/Windows.hs            |  168 +++++++++++++++++++++++++++++++++++++++++---
 Prelude.hs                |    6 +-
 System/Environment.hs     |    2 +-
 Text/Printf.hs            |    4 +-
 Text/Read.hs              |    4 +-
 cbits/Win32Utils.c        |   69 +++++++++++-------
 include/HsBase.h          |    1 +
 20 files changed, 242 insertions(+), 85 deletions(-)