Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : master
http://hackage.haskell.org/trac/ghc/changeset/e194712ddadef0f09898a85613a7956b63ff5a6b >--------------------------------------------------------------- commit e194712ddadef0f09898a85613a7956b63ff5a6b Merge: ed4252c... 71fee32... Author: Ben Lippmeier <[email protected]> Date: Thu Nov 17 12:34:57 2011 +1100 Merge /Users/benl/devel/ghc/ghc-head-devel Conflicts: compiler/vectorise/Vectorise/Type/PRepr.hs compiler/basicTypes/OccName.lhs | 28 +- compiler/deSugar/DsMonad.lhs | 28 +- compiler/ghc.cabal.in | 8 +- compiler/vectorise/Vectorise/Builtins/Base.hs | 18 +- .../vectorise/Vectorise/Builtins/Initialise.hs | 73 ++-- .../vectorise/Vectorise/Generic/Description.hs | 279 ++++++++++ .../Vectorise/{Type => Generic}/PADict.hs | 55 +- compiler/vectorise/Vectorise/Generic/PAMethods.hs | 544 ++++++++++++++++++++ compiler/vectorise/Vectorise/Generic/PData.hs | 151 ++++++ compiler/vectorise/Vectorise/Type/Env.hs | 36 +- compiler/vectorise/Vectorise/Type/PData.hs | 87 ---- compiler/vectorise/Vectorise/Type/Repr.hs | 107 ---- compiler/vectorise/Vectorise/Utils/Base.hs | 92 +++- 13 files changed, 1173 insertions(+), 333 deletions(-) diff --cc compiler/ghc.cabal.in index aea6d8d,a976efa..a976efa mode 100644,100755..100644 --- a/compiler/ghc.cabal.in +++ b/compiler/ghc.cabal.in _______________________________________________ Cvs-ghc mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-ghc
