tree 30fcfe4e5ef34cea344fb36c85882a01b57eae01
parent 57fb0ee3770d2b22d4a9e1bb45f2b49d5c3095e0
author Bill Wendling <isanbard@gmail.com> 1284063039 +0000
committer Bill Wendling <isanbard@gmail.com> 1284063039 +0000

Approved by Duncan:

$ svn merge -c 113357 https://llvm.org/svn/llvm-project/llvm-gcc-4.2/trunk
--- Merging r113357 into '.':
U    gcc/llvm-convert.cpp
U    gcc/llvm-internal.h
$ svn merge -c 113361 https://llvm.org/svn/llvm-project/llvm-gcc-4.2/trunk
--- Merging r113361 into '.':
G    gcc/llvm-convert.cpp

llvm-svn: 113530