Fix merge-related problems
authorSimon Marlow <marlowsd@gmail.com>
Wed, 4 Jul 2012 12:19:26 +0000 (13:19 +0100)
committerSimon Marlow <marlowsd@gmail.com>
Wed, 4 Jul 2012 12:19:47 +0000 (13:19 +0100)
commit3f0afabaf3e862d986279dc041b14b61e73f86d3
tree30b0a2dabcdbf01688040ea28128292970dc4085
parent99fd2469fba1a38b2a65b4694f337d92e559df01
Fix merge-related problems
12 files changed:
compiler/cmm/CmmBuildInfoTables.hs
compiler/cmm/CmmLayoutStack.hs
compiler/cmm/CmmLint.hs
compiler/cmm/CmmOpt.hs
compiler/cmm/CmmPipeline.hs
compiler/codeGen/CodeGen.lhs
compiler/codeGen/StgCmmHeap.hs
compiler/codeGen/StgCmmUtils.hs
compiler/main/CodeOutput.lhs
compiler/main/HscMain.hs
compiler/nativeGen/AsmCodeGen.lhs
compiler/utils/Outputable.lhs