Merge branch 'master' of darcs.haskell.org:/home/darcs/ghc
authorSimon Peyton Jones <simonpj@microsoft.com>
Wed, 19 Dec 2012 10:32:09 +0000 (10:32 +0000)
committerSimon Peyton Jones <simonpj@microsoft.com>
Wed, 19 Dec 2012 10:32:09 +0000 (10:32 +0000)
commit650f76fe29394adac14fd59cafe72cec3125daf5
tree950e9429fa7715c1a207b87d1536c93688af2779
parentb5853125ca6a5637647d0b0f2d6271cbf219b337
parent909d52e20405bf18b5fb337e64318112bb553cd8
Merge branch 'master' of darcs.haskell.org:/home/darcs/ghc
compiler/hsSyn/Convert.lhs
compiler/main/DynFlags.hs
compiler/typecheck/TcInstDcls.lhs
compiler/typecheck/TcTyClsDecls.lhs