summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordim <dim@FreeBSD.org>2015-01-25 23:36:55 +0000
committerdim <dim@FreeBSD.org>2015-01-25 23:36:55 +0000
commit7db7b571b9ca5f0f069fd72715b1e2d05940dc75 (patch)
tree207818496120a5253e3c6a0de3db038ae3c115f5
parentaa0ac99391af2cc2286fadd774dc5cf9f2edb7a6 (diff)
parent081af4da16b9046c019ca40f64b1fb7ee8c6dca1 (diff)
parentc86b984ea8ecb3e944dc3de48539f4c1f65851ea (diff)
downloadFreeBSD-src-7db7b571b9ca5f0f069fd72715b1e2d05940dc75.zip
FreeBSD-src-7db7b571b9ca5f0f069fd72715b1e2d05940dc75.tar.gz
Merge llvm 3.6.0rc1 from ^/vendor/llvm/dist, merge clang 3.6.0rc1 from
^/vendor/clang/dist, resolve conflicts, and cleanup patches.
OpenPOWER on IntegriCloud