summaryrefslogtreecommitdiff
path: root/lib/Frontend/ASTMerge.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Vendor import of stripped clang trunk r366426 (just before thevendor/clang/clang-trunk-r366426Dimitry Andric2019-08-201-10/+11
| | | | | | | | | | release_90 branch point): https://llvm.org/svn/llvm-project/cfe/trunk@366426 Notes: svn path=/vendor/clang/dist/; revision=351280 svn path=/vendor/clang/clang-trunk-r366426/; revision=351281; tag=vendor/clang/clang-trunk-r366426
* Vendor import of clang trunk r351319 (just before the release_80 branchvendor/clang/clang-trunk-r351319Dimitry Andric2019-01-191-5/+6
| | | | | | | | | point): https://llvm.org/svn/llvm-project/cfe/trunk@351319 Notes: svn path=/vendor/clang/dist/; revision=343173 svn path=/vendor/clang/clang-trunk-r351319/; revision=343174; tag=vendor/clang/clang-trunk-r351319
* Vendor import of clang trunk r338536:vendor/clang/clang-trunk-r338536Dimitry Andric2018-08-021-5/+5
| | | | | | | | https://llvm.org/svn/llvm-project/cfe/trunk@338536 Notes: svn path=/vendor/clang/dist/; revision=337139 svn path=/vendor/clang/clang-trunk-r338536/; revision=337140; tag=vendor/clang/clang-trunk-r338536
* Vendor import of clang trunk r338150:vendor/clang/clang-trunk-r338150Dimitry Andric2018-07-281-1/+1
| | | | | | | | https://llvm.org/svn/llvm-project/cfe/trunk@338150 Notes: svn path=/vendor/clang/dist/; revision=336815 svn path=/vendor/clang/clang-trunk-r338150/; revision=336816; tag=vendor/clang/clang-trunk-r338150
* Vendor import of clang trunk r306956:vendor/clang/clang-trunk-r306956Dimitry Andric2017-07-011-3/+3
| | | | | | | | https://llvm.org/svn/llvm-project/cfe/trunk@306956 Notes: svn path=/vendor/clang/dist/; revision=320535 svn path=/vendor/clang/clang-trunk-r306956/; revision=320536; tag=vendor/clang/clang-trunk-r306956
* Vendor import of clang trunk r305145:vendor/clang/clang-trunk-r305145Dimitry Andric2017-06-101-3/+2
| | | | | | | | https://llvm.org/svn/llvm-project/cfe/trunk@305145 Notes: svn path=/vendor/clang/dist/; revision=319782 svn path=/vendor/clang/clang-trunk-r305145/; revision=319783; tag=vendor/clang/clang-trunk-r305145
* Vendor import of clang release_39 branch r276489:vendor/clang/clang-release_39-r276489Dimitry Andric2016-07-231-3/+2
| | | | | | | | https://llvm.org/svn/llvm-project/cfe/branches/release_39@276489 Notes: svn path=/vendor/clang/dist/; revision=303233 svn path=/vendor/clang/clang-release_39-r276489/; revision=303234; tag=vendor/clang/clang-release_39-r276489
* Vendor import of clang trunk r256633:vendor/clang/clang-trunk-r256633Dimitry Andric2015-12-301-1/+0
| | | | | | | | https://llvm.org/svn/llvm-project/cfe/trunk@256633 Notes: svn path=/vendor/clang/dist/; revision=292920 svn path=/vendor/clang/clang-trunk-r256633/; revision=292923; tag=vendor/clang/clang-trunk-r256633
* Import clang 3.7.0 release (r246257).vendor/clang/clang-release_370-r246257Dimitry Andric2015-09-061-1/+1
| | | | | Notes: svn path=/vendor/clang/dist/; revision=287512 svn path=/vendor/clang/clang-release_370-r246257/; revision=287513; tag=vendor/clang/clang-release_370-r246257
* Vendor import of clang trunk r240225:vendor/clang/clang-trunk-r240225Dimitry Andric2015-06-211-2/+4
| | | | | | | | https://llvm.org/svn/llvm-project/cfe/trunk@240225 Notes: svn path=/vendor/clang/dist/; revision=284679 svn path=/vendor/clang/clang-trunk-r240225/; revision=284680; tag=vendor/clang/clang-trunk-r240225
* Vendor import of clang trunk r238337:vendor/clang/clang-trunk-r238337Dimitry Andric2015-05-271-1/+7
| | | | | | | | https://llvm.org/svn/llvm-project/cfe/trunk@238337 Notes: svn path=/vendor/clang/dist/; revision=283627 svn path=/vendor/clang/clang-trunk-r238337/; revision=283628; tag=vendor/clang/clang-trunk-r238337
* Vendor import of clang RELEASE_360/rc1 tag r226102 (effectively, 3.6.0 RC1):vendor/clang/clang-release_360-r226102Dimitry Andric2015-01-181-6/+4
| | | | | | | | https://llvm.org/svn/llvm-project/cfe/tags/RELEASE_360/rc1@226102 Notes: svn path=/vendor/clang/dist/; revision=277325 svn path=/vendor/clang/clang-release_360-r226102/; revision=277326; tag=vendor/clang/clang-release_360-r226102
* Vendor import of clang RELEASE_350/final tag r216957 (effectively, 3.5.0 ↵vendor/clang/clang-release_350-r216957Dimitry Andric2014-11-241-5/+3
| | | | | | | | | | release): https://llvm.org/svn/llvm-project/cfe/tags/RELEASE_350/final@216957 Notes: svn path=/vendor/clang/dist/; revision=274958 svn path=/vendor/clang/clang-release_350-r216957/; revision=274959; tag=vendor/clang/clang-release_350-r216957
* Vendor import of clang tags/RELEASE_33/final r183502 (effectively, 3.3vendor/clang/clang-release_33-r183502Dimitry Andric2013-06-101-3/+4
| | | | | | | | | release): http://llvm.org/svn/llvm-project/cfe/tags/RELEASE_33/final@183502 Notes: svn path=/vendor/clang/dist/; revision=251609 svn path=/vendor/clang/clang-release_33-r183502/; revision=251610; tag=vendor/clang/clang-release_33-r183502
* Vendor import of clang trunk r178860:vendor/clang/clang-trunk-r178860Dimitry Andric2013-04-081-2/+2
| | | | | | | | http://llvm.org/svn/llvm-project/cfe/trunk@178860 Notes: svn path=/vendor/clang/dist/; revision=249261 svn path=/vendor/clang/clang-trunk-r178860/; revision=249262; tag=vendor/clang/clang-trunk-r178860
* Vendor import of clang release_32 branch r168974 (effectively, 3.2 RC2):vendor/clang/clang-release_32-r168974Dimitry Andric2012-12-021-2/+3
| | | | | | | | http://llvm.org/svn/llvm-project/cfe/branches/release_32@168974 Notes: svn path=/vendor/clang/dist/; revision=243791 svn path=/vendor/clang/clang-release_32-r168974/; revision=243792; tag=vendor/clang/clang-release_32-r168974
* Vendor import of clang trunk r154661:vendor/clang/clang-trunk-r154661Dimitry Andric2012-04-141-7/+6
| | | | | | | | http://llvm.org/svn/llvm-project/cfe/trunk@r154661 Notes: svn path=/vendor/clang/dist/; revision=234287 svn path=/vendor/clang/clang-trunk-r154661/; revision=234288; tag=vendor/clang/clang-trunk-r154661
* Vendor import of clang release_30 branch r142614:vendor/clang/clang-r142614Dimitry Andric2011-10-201-6/+6
| | | | | | | | http://llvm.org/svn/llvm-project/cfe/branches/release_30@142614 Notes: svn path=/vendor/clang/dist/; revision=226586 svn path=/vendor/clang/clang-r142614/; revision=226587; tag=vendor/clang/clang-r142614
* Vendor import of clang trunk r126079:vendor/clang/clang-r126079Dimitry Andric2011-02-201-11/+10
| | | | | | | | http://llvm.org/svn/llvm-project/cfe/trunk@126079 Notes: svn path=/vendor/clang/dist/; revision=218887 svn path=/vendor/clang/clang-r126079/; revision=218888; tag=vendor/clang/clang-r126079
* Vendor import of clang r114020 (from the release_28 branch):vendor/clang/clang-r114020Dimitry Andric2010-09-171-1/+7
| | | | | | | | | | http://llvm.org/svn/llvm-project/cfe/branches/release_28@114020 Approved by: rpaulo (mentor) Notes: svn path=/vendor/clang/dist/; revision=212795 svn path=/vendor/clang/clang-r114020/; revision=212796; tag=vendor/clang/clang-r114020
* Update clang to r108243.vendor/clang/clang-r108243Roman Divacky2010-07-131-3/+4
| | | | | Notes: svn path=/vendor/clang/dist/; revision=210008 svn path=/vendor/clang/clang-r108243/; revision=210076; tag=vendor/clang/clang-r108243
* Update clang to r100520.Roman Divacky2010-04-061-2/+3
| | | | Notes: svn path=/vendor/clang/dist/; revision=206275
* Update clang to r96341.Roman Divacky2010-02-161-0/+103
Notes: svn path=/vendor/clang/dist/; revision=203955