Merge branch 'master' of http://darcs.haskell.org/ghc
authorAdam Megacz <adam@megacz.com>
Mon, 25 Apr 2011 00:31:58 +0000 (17:31 -0700)
committerAdam Megacz <adam@megacz.com>
Mon, 25 Apr 2011 00:31:58 +0000 (17:31 -0700)
commit1c6d61ee06972de3c4797e1925e265f7dc7c361c
tree6649f0ba48ea7a407acdbbcd8fdc5d8fac490995
parentcf5905ea24904cf73a041fd7535e8723a668cb9a
parent93b6e53272695a66d97bd2672dd366797176d5c5
Merge branch 'master' of darcs.haskell.org/ghc
compiler/basicTypes/Name.lhs
compiler/basicTypes/OccName.lhs
compiler/main/DynFlags.hs
compiler/typecheck/TcRnTypes.lhs
ghc.mk