aboutsummaryrefslogtreecommitdiff
path: root/contrib/llvm/include
diff options
context:
space:
mode:
authorDimitry Andric <dim@FreeBSD.org>2015-01-31 21:57:38 +0000
committerDimitry Andric <dim@FreeBSD.org>2015-01-31 21:57:38 +0000
commit3de688eb1662cc15a7d03d6df06ced4c8af1e839 (patch)
treeaeab28fc1964cf0e6ba5c8157bb158c25a660444 /contrib/llvm/include
parentacdf53f9a3170d092829475dacd0483a85143ec6 (diff)
parent9e435806aaf5bd7e974d317ef247f200200ad686 (diff)
parentec304151b74f9254d7029ee4d197ce1f7cbe501a (diff)
downloadsrc-3de688eb1662cc15a7d03d6df06ced4c8af1e839.tar.gz
src-3de688eb1662cc15a7d03d6df06ced4c8af1e839.zip
Merge llvm 3.6.0rc2 from ^/vendor/llvm/dist, merge clang 3.6.0rc2 from
^/vendor/clang/dist, resolve conflicts, and cleanup patches.
Notes
Notes: svn path=/projects/clang360-import/; revision=278002