aboutsummaryrefslogtreecommitdiff
path: root/contrib/llvm/tools/clang
diff options
context:
space:
mode:
authorDimitry Andric <dim@FreeBSD.org>2015-02-14 14:13:00 +0000
committerDimitry Andric <dim@FreeBSD.org>2015-02-14 14:13:00 +0000
commit44f7b0dcc50a4bd75efcc4477e1eb60c628d6fc8 (patch)
treea7bc5b362ad6182396e88b223352f75d52966813 /contrib/llvm/tools/clang
parent569e61a4fcc0efd851aa16c069ec9641d2fb896c (diff)
parentec12bbe359799efc32df6bde5e872cb2713c0b19 (diff)
parent608e665946afc2b89050fcf0b99070db2c006bee (diff)
downloadsrc-44f7b0dcc50a4bd75efcc4477e1eb60c628d6fc8.tar.gz
src-44f7b0dcc50a4bd75efcc4477e1eb60c628d6fc8.zip
Merge llvm 3.6.0rc3 from ^/vendor/llvm/dist, merge clang 3.6.0rc3 from
^/vendor/clang/dist, resolve conflicts, and update patches README.
Notes
Notes: svn path=/projects/clang360-import/; revision=278757