[commit: template-haskell] overlapping-tyfams: Merge branch 'master' into overlapping-tyfams (c32283a)
Richard Eisenberg <[email protected]> Thu, 06 Dec 2012 18:19:14 -0800
| Newsgroups | gmane.comp.lang.haskell.cvs.libraries |
|---|---|
| Message-ID | <[email protected]> |
Repository : ssh://darcs.haskell.org//srv/darcs/packages/template-haskell On branch : overlapping-tyfams http://hackage.haskell.org/trac/ghc/changeset/c32283ab8f1d4d482ce4e617828e486093d537eb >--------------------------------------------------------------- commit c32283ab8f1d4d482ce4e617828e486093d537eb Merge: 2de9642... 6078f13... Author: Richard Eisenberg <[email protected]> Date: Tue Dec 4 13:59:18 2012 -0500 Merge branch 'master' into overlapping-tyfams Conflicts: template-haskell.cabal template-haskell.cabal | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-)