tree c3e3acffbc1732bb6093c80b4ad68330d51f0928
parent 66fc7246b92ea7a70c189d386b4cd2c35ec91407
author Bill Wendling <isanbard@gmail.com> 1271219189 +0000
committer Bill Wendling <isanbard@gmail.com> 1271219189 +0000

$ svn merge -c 101216 https://llvm.org/svn/llvm-project/llvm-gcc-4.2/trunk
--- Merging r101216 into '.':
U    gcc/llvm-convert.cpp

llvm-svn: 101225