aboutsummaryrefslogtreecommitdiff
path: root/contrib/llvm/tools/clang/lib/Frontend/ASTMerge.cpp
Commit message (Expand)AuthorAgeFilesLines
* Merge llvm, clang, lld, lldb, compiler-rt and libc++ r306956, and updateDimitry Andric2017-07-021-3/+3
* Merge llvm, clang, lld, lldb, compiler-rt and libc++ r305145, and updateDimitry Andric2017-06-101-3/+2
* Update clang to release_39 branch r276489, and resolve conflicts.Dimitry Andric2016-08-161-3/+2
* Update clang to trunk r256633.Dimitry Andric2015-12-301-1/+0
* Update llvm, clang and lldb to 3.7.0 release.Dimitry Andric2015-09-061-1/+1
* Update llvm/clang to r240225.Dimitry Andric2015-06-231-2/+4
* Merge clang trunk r238337 from ^/vendor/clang/dist, resolve conflicts,Dimitry Andric2015-05-271-1/+7
* Merge llvm 3.6.0rc1 from ^/vendor/llvm/dist, merge clang 3.6.0rc1 fromDimitry Andric2015-01-251-6/+4
* Merge clang 3.5.0 release from ^/vendor/clang/dist, resolve conflicts,Dimitry Andric2014-11-241-5/+3
* Upgrade our copy of llvm/clang to 3.3 release.Dimitry Andric2013-06-121-3/+4
* Upgrade our copy of llvm/clang to trunk r178860, in preparation of theDimitry Andric2013-04-121-2/+2
* Upgrade our copy of llvm/clang to r168974, from upstream's release_32Dimitry Andric2012-12-031-2/+3
* Upgrade our copy of llvm/clang to trunk r154661, in preparation of theDimitry Andric2012-04-161-7/+6
* Upgrade our copy of llvm/clang to r142614, from upstream's release_30Dimitry Andric2011-10-221-6/+6
* Upgrade our copy of llvm/clang to r126079, from upstream's trunk.Dimitry Andric2011-02-201-11/+10
* Upgrade our Clang in base to r114020, from upstream's release_28 branch.Dimitry Andric2010-09-201-1/+7
* Upgrade our Clang in base to r108428.Ed Schouten2010-07-201-3/+4
* Import LLVM/clang from vendor stripped of docs/ test/ website/ www/ examples/Roman Divacky2010-06-091-0/+104