Merge commit with origin/master
authorSimon Peyton Jones <simonpj@microsoft.com>
Tue, 21 Oct 2014 14:11:29 +0000 (15:11 +0100)
committerSimon Peyton Jones <simonpj@microsoft.com>
Tue, 21 Oct 2014 14:11:29 +0000 (15:11 +0100)
1  2 
compiler/typecheck/TcDeriv.lhs
compiler/typecheck/TcGenDeriv.lhs
compiler/typecheck/TcInstDcls.lhs
compiler/types/FamInstEnv.lhs
rts/Linker.c
testsuite/tests/simplCore/should_compile/T6056.stderr
testsuite/tests/th/all.T

Simple merge
Simple merge
Simple merge
Simple merge
diff --cc rts/Linker.c
Simple merge
@@@ -8,5 -8,5 +8,6 @@@ Rule fired: SPEC/T6056 $wsmallerAndRes
  Rule fired: SPEC/T6056 $wsmallerAndRest @ Integer
  Rule fired: SPEC/T6056 $wsmallerAndRest @ Int
  Rule fired: SPEC/T6056 $wsmallerAndRest @ Int
 -Rule fired: SPEC/T6056 $wsmallerAndRest @ Integer
  Rule fired: SPEC/T6056 $wsmallerAndRest @ Int
 +Rule fired: SPEC/T6056 $wsmallerAndRest @ Integer
++
Simple merge