Fix merge error
authorAnton Korobeynikov <asl@math.spbu.ru>
Sun, 17 Aug 2008 13:56:03 +0000 (13:56 +0000)
committerAnton Korobeynikov <asl@math.spbu.ru>
Sun, 17 Aug 2008 13:56:03 +0000 (13:56 +0000)
commit4a8978b61c0536d57bfa32bc5c590fdb6d0113a4
treeb7154914d4c462931682895fd451f7d769325381
parentc40c8b333d1b4f885ee0f972f2b91965f3d683fd
Fix merge error

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@54891 91177308-0d34-0410-b5e6-96231b3b80d8
include/llvm/CodeGen/LinkAllCodegenComponents.h
lib/CodeGen/AsmPrinter/AsmPrinter.cpp
lib/CodeGen/AsmPrinter/OcamlGCMetadataPrinter.cpp [deleted file]
lib/CodeGen/AsmPrinter/OcamlGCPrinter.cpp [new file with mode: 0644]
lib/CodeGen/OcamlGCPrinter.cpp [deleted file]