From 05cbe3bcbc92a96409200151d08e791a8d83fd76 Mon Sep 17 00:00:00 2001 From: dim Date: Wed, 25 Feb 2015 18:50:24 +0000 Subject: Merge llvm 3.6.0 final from ^/vendor/llvm/dist, merge clang 3.6.0 final from ^/vendor/clang/dist, and resolve conflicts. --- contrib/llvm/tools/clang/lib/Basic/Version.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'contrib/llvm/tools/clang/lib/Basic/Version.cpp') diff --git a/contrib/llvm/tools/clang/lib/Basic/Version.cpp b/contrib/llvm/tools/clang/lib/Basic/Version.cpp index d42628a..982410b 100644 --- a/contrib/llvm/tools/clang/lib/Basic/Version.cpp +++ b/contrib/llvm/tools/clang/lib/Basic/Version.cpp @@ -36,7 +36,7 @@ std::string getClangRepositoryPath() { // If the SVN_REPOSITORY is empty, try to use the SVN keyword. This helps us // pick up a tag in an SVN export, for example. - StringRef SVNRepository("$URL: https://llvm.org/svn/llvm-project/cfe/tags/RELEASE_360/rc4/lib/Basic/Version.cpp $"); + StringRef SVNRepository("$URL: https://llvm.org/svn/llvm-project/cfe/tags/RELEASE_360/final/lib/Basic/Version.cpp $"); if (URL.empty()) { URL = SVNRepository.slice(SVNRepository.find(':'), SVNRepository.find("/lib/Basic")); -- cgit v1.1