Wed Sep 20 10:49:47 PDT 2006 Manuel M T Chakravarty <[EMAIL PROTECTED]>
* fixing record selectors
Mon Sep 18 16:50:18 EDT 2006 Manuel M T Chakravarty <[EMAIL PROTECTED]>
* fixing record selectors
Sun Aug 6 19:56:29 EDT 2006 Manuel M T Chakravarty <[EMAIL PROTECTED]>
* fixing record selectors
Fri Jul 28 10:24:28 EDT 2006 [EMAIL PROTECTED]
- Bad conflict in tcIfaceDataAlt, at a place where the monster patch had
a
conflict, too. I have no idea what the right code is. -=chak
NB (at time of 2nd merge): previous conflict resolution was fine
M ./compiler/basicTypes/DataCon.lhs -3 +6
M ./compiler/basicTypes/Id.lhs -3 +4
M ./compiler/basicTypes/MkId.lhs -22 +36
M ./compiler/basicTypes/Var.lhs -3 +5
M ./compiler/coreSyn/CoreLint.lhs -1 +1
M ./compiler/coreSyn/CoreUtils.lhs -6 +51
M ./compiler/iface/TcIface.lhs -14 +8
M ./compiler/typecheck/TcGadt.lhs -7 +9
_______________________________________________
Cvs-ghc mailing list
[EMAIL PROTECTED]
http://www.haskell.org/mailman/listinfo/cvs-ghc
