projects / ghc-hetmet.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 1f95d6d) | patch
Resolve conflict in MkExternalCore
authorManuel M T Chakravarty <chak@cse.unsw.edu.au>
Sun, 6 Aug 2006 01:10:28 +0000 (01:10 +0000)
committerManuel M T Chakravarty <chak@cse.unsw.edu.au>
Sun, 6 Aug 2006 01:10:28 +0000 (01:10 +0000)
commite6e4036c03b21295e6457d0443106cf4e2830f4a
tree06c0ee23fbb4ba50e447d8658aa1d3197c5ec920tree | snapshot
parent1f95d6db898bc4c92ebb8a8e8f9920d5237bac61commit | diff
Resolve conflict in MkExternalCore
Thu Jul  6 09:55:27 EDT 2006  simonpj@microsoft.com
compiler/coreSyn/MkExternalCore.lhs diff | blob | history
Glasgow Haskell Compiler with heterogeneous metaprogramming (generalized arrows and modal types)