projects
/
ghc-hetmet.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
(from:
ffabe3a
)
Merge branch 'master' of http://darcs.haskell.org/ghc into ghc-generics
author
Jose Pedro Magalhaes
<jpm@cs.uu.nl>
Wed, 4 May 2011 19:43:41 +0000
(21:43 +0200)
committer
Jose Pedro Magalhaes
<jpm@cs.uu.nl>
Wed, 4 May 2011 19:43:41 +0000
(21:43 +0200)
Fixed conflicts:
compiler/prelude/PrelNames.lhs
No differences found
projects / ghc-hetmet.git / commitdiff