Merge branch 'master' of http://darcs.haskell.org/ghc into ghc-generics
authorJose Pedro Magalhaes <jpm@cs.uu.nl>
Wed, 27 Apr 2011 11:20:57 +0000 (13:20 +0200)
committerJose Pedro Magalhaes <jpm@cs.uu.nl>
Wed, 27 Apr 2011 11:20:57 +0000 (13:20 +0200)
commitfbff1b7b9c89f6369c4394a0b10fa7c06e011698
tree98e6dc75bdcadab602b99b9d63add2ff4fb7d2ff
parent191292aaa7f56f32fc546478f43aa89ac67c95a3
parent06f69812ccf28af381cd97e7759d00a27d9709ac
Merge branch 'master' of darcs.haskell.org/ghc into ghc-generics
compiler/basicTypes/OccName.lhs
compiler/iface/MkIface.lhs
compiler/parser/Lexer.x
compiler/rename/RnBinds.lhs
compiler/rename/RnSource.lhs