[commit: base] ghc-generics1: Move GHC.Generics from ghc-prim to base (0e1129d)

[José Pedro Magalhães]

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

On branch  : ghc-generics1

http://hackage.haskell.org/trac/ghc/changeset/0e1129dd8a1dad000fad40159350a6e2bed6c4a4

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

commit 0e1129dd8a1dad000fad40159350a6e2bed6c4a4
Author: Jose Pedro Magalhaes <jpm at cs.ox.ac.uk>
Date:   Tue Jun 5 17:22:31 2012 +0100

    Move GHC.Generics from ghc-prim to base
    
    Conflicts:
    
    	base.cabal

 Data/Either.hs  |    5 +-
 Data/Maybe.hs   |    5 +-
 GHC/Generics.hs |  260 +++++++++++++++++++++++++++++++++++++++++++++++++++++++
 GHC/Read.lhs    |   10 --
 GHC/Show.lhs    |   10 --
 base.cabal      |    1 +
 6 files changed, 265 insertions(+), 26 deletions(-)


Diff suppressed because of size. To see it, use:

    git show 0e1129dd8a1dad000fad40159350a6e2bed6c4a4