summaryrefslogtreecommitdiff
path: root/contrib/llvm/tools/clang/lib/AST/ExternalASTMerger.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Move all sources from the llvm project into contrib/llvm-project.Dimitry Andric2019-12-201-454/+0
| | | | | | | | | | | | | This uses the new layout of the upstream repository, which was recently migrated to GitHub, and converted into a "monorepo". That is, most of the earlier separate sub-projects with their own branches and tags were consolidated into one top-level directory, and are now branched and tagged together. Updating the vendor area to match this layout is next. Notes: svn path=/head/; revision=355940
* Merge clang trunk r366426, resolve conflicts, and update FREEBSD-Xlist.Dimitry Andric2019-08-211-24/+43
| | | | Notes: svn path=/projects/clang900-import/; revision=351350
* Merge clang trunk r351319, resolve conflicts, and update FREEBSD-Xlist.Dimitry Andric2019-01-201-4/+6
| | | | Notes: svn path=/projects/clang800-import/; revision=343214
* Merge clang trunk r338150, and resolve conflicts.Dimitry Andric2018-07-311-7/+38
| | | | Notes: svn path=/projects/clang700-import/; revision=336979
* Merge clang trunk r321017 to contrib/llvm/tools/clang.Dimitry Andric2017-12-201-89/+309
| | | | Notes: svn path=/projects/clang600-import/; revision=327024
* Merge llvm, clang, lld, lldb, compiler-rt and libc++ r307894, and updateDimitry Andric2017-07-131-5/+0
| | | | | | | build glue. Notes: svn path=/projects/clang500-import/; revision=320970
* Merge llvm, clang, lld, lldb, compiler-rt and libc++ r306325, and updateDimitry Andric2017-06-271-0/+1
| | | | | | | build glue. Notes: svn path=/projects/clang500-import/; revision=320397
* Merge llvm, clang, lld, lldb, compiler-rt and libc++ r303197, and updateDimitry Andric2017-05-161-0/+6
| | | | | | | build glue. Notes: svn path=/projects/clang500-import/; revision=318384
* Merge llvm, clang, lld and lldb trunk r300890, and update build glue.Dimitry Andric2017-04-201-22/+17
| | | | Notes: svn path=/projects/clang500-import/; revision=317230
* Merge clang trunk r300422 and resolve conflicts.Dimitry Andric2017-04-161-0/+185
Notes: svn path=/projects/clang500-import/; revision=317030