summaryrefslogtreecommitdiff
path: root/test/Modules/merge-nested-templates.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Vendor import of clang trunk r240225:vendor/clang/clang-trunk-r240225Dimitry Andric2015-06-211-1/+1
| | | | | | | | 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-0/+4
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