[commit: haddock] overlapping-tyfams's head updated: Fixed merging errors (c45f106)

Richard Eisenberg <[email protected]>
Newsgroups gmane.comp.lang.haskell.cvs.ghc
Message-ID <[email protected]> 
Repository : ssh://darcs.haskell.org//srv/darcs/haddock

Branch 'overlapping-tyfams' now includes:

     671b211... Improve haddock memory usage
     2ad3ed1... Remove some temporary pragmas I accidentally recorded
     84fac41... Merge branch 'master' into overlapping-tyfams
     a1d2c63... Follow data type changes in the tc-untouchables branch
     b1d1351... Follow changes in GHC build system
     184781c... Merge remote-tracking branch 'origin/master' into tc-untouchables
     78e3834... Follow change in GHC build system
     2a72fa2... Follow changes in GHC
     e73f3e5... Follow dopt->gopt rename
     1baca3e... Follow changes in GHC: 'flags' has been renamed 'generalFlags'
     0672eda... Merge branch 'master' into overlapping-tyfams
     c45f106... Fixed merging errors
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.