Merge remote-tracking branch 'laptop/newcg' into newcg
authorMe at work <simonmar-work@simonmar-laptop.(none)>
Tue, 14 Feb 2012 11:49:53 +0000 (11:49 +0000)
committerMe at work <simonmar-work@simonmar-laptop.(none)>
Tue, 14 Feb 2012 11:49:53 +0000 (11:49 +0000)
commit1e07bd74037127d3b9c90f7e7246c6761fced953
treef8b976de22b854bd1c98e73a54bc8cb464eb9335
parent8fb67a2a9c798976cefecb8d69d73fde5383c4f1
parent5cf9c0191566a3fd806a12e58b93ee813d4528f9
Merge remote-tracking branch 'laptop/newcg' into newcg
compiler/codeGen/CgInfoTbls.hs
compiler/codeGen/StgCmmForeign.hs