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)
commitd127a697192851ea6bf308525a8a8895da71b639
tree895f8976273df8e96b7c52382529ca0dfee61a5a
parenta2e338f3ae5a101d333fb260ed58ec238106e88e
parent32ade417f7e82b6fbcb6f1c93871ba3141a8f5c8
Merge remote-tracking branch 'origin/master' into ghc-parmake-gsoc
compiler/main/TidyPgm.lhs
rts/PrimOps.cmm