[commit: ghc] cardinality: Merge branch 'new-demand-to-merge' into cardinality (0b24b72)
Ilya Sergey <[email protected]>
| Newsgroups | gmane.comp.lang.haskell.cvs.ghc |
|---|---|
| Message-ID | <[email protected]> |
Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : cardinality http://hackage.haskell.org/trac/ghc/changeset/0b24b723f44441c199e5c6f6533e6e85f1c02646 >--------------------------------------------------------------- commit 0b24b723f44441c199e5c6f6533e6e85f1c02646 Merge: 8adb606... 9bb7505... Author: ilyasergey <[email protected]> Date: Thu Nov 8 17:52:30 2012 +0100 Merge branch 'new-demand-to-merge' into cardinality Conflicts: compiler/stranal/DmdAnal.lhs compiler/basicTypes/Demand.lhs | 2 +- compiler/stranal/DmdAnal.lhs | 65 +++++++++++++++++++++------------------- 2 files changed, 35 insertions(+), 32 deletions(-) Diff suppressed because of size. To see it, use: git show 0b24b723f44441c199e5c6f6533e6e85f1c02646