[commit: ghc] wip/GenericsMetaData: Merge branch 'master' into wip/GenericsMetaData (3744afb)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/ghc

On branch  : wip/GenericsMetaData
Link       : http://ghc.haskell.org/trac/ghc/changeset/3744afb5d91ebbe235230b7e9a03e1918ed4aa2c/ghc

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

commit 3744afb5d91ebbe235230b7e9a03e1918ed4aa2c
Merge: d8e8996 d3a7126
Author: Jose Pedro Magalhaes <jpm at cs.ox.ac.uk>
Date:   Tue Nov 4 11:10:27 2014 +0000

    Merge branch 'master' into wip/GenericsMetaData



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

3744afb5d91ebbe235230b7e9a03e1918ed4aa2c
 compiler/simplCore/CallArity.hs          |   4 +-
 compiler/simplCore/SetLevels.lhs         |   2 +-
 docs/users_guide/7.10.1-notes.xml        |  22 +-
 libraries/base/Data/Bool.hs              |  40 ++--
 libraries/base/Data/Char.hs              | 341 +++++++++++++++++++++++++++++--
 libraries/base/Data/Fixed.hs             |  25 +--
 libraries/base/Data/Typeable.hs          |  21 +-
 libraries/base/Data/Typeable/Internal.hs |  27 ++-
 libraries/base/GHC/Show.lhs              |   1 +
 libraries/base/base.cabal                |   1 -
 libraries/base/changelog.md              |   2 +
 libraries/base/tests/T9681.hs            |   3 +
 libraries/base/tests/T9681.stderr        |   5 +
 libraries/base/tests/all.T               |   1 +
 testsuite/.gitignore                     |   4 +-
 testsuite/driver/testlib.py              |  10 +-
 utils/haddock                            |   2 +-
 17 files changed, 413 insertions(+), 98 deletions(-)