Merge remote-tracking branch 'origin/master' into ghc-parmake-gsoc
authorPatrick Palka <patrick@parcs.ath.cx>
Wed, 4 Sep 2013 16:10:27 +0000 (12:10 -0400)
committerPatrick Palka <patrick@parcs.ath.cx>
Wed, 4 Sep 2013 16:10:27 +0000 (12:10 -0400)
1  2 
compiler/main/TidyPgm.lhs
rts/PrimOps.cmm

Simple merge
diff --cc rts/PrimOps.cmm
Simple merge