diff options
| author | dim <dim@FreeBSD.org> | 2015-02-25 18:50:24 +0000 |
|---|---|---|
| committer | dim <dim@FreeBSD.org> | 2015-02-25 18:50:24 +0000 |
| commit | 05cbe3bcbc92a96409200151d08e791a8d83fd76 (patch) | |
| tree | b783716227b7ac689d5e5af7146963eb3749106e /lib/clang/include | |
| parent | 77928dd8d2eecaaa4ba3e4124a3fa0d46c125b39 (diff) | |
| download | FreeBSD-src-05cbe3bcbc92a96409200151d08e791a8d83fd76.zip FreeBSD-src-05cbe3bcbc92a96409200151d08e791a8d83fd76.tar.gz | |
Merge llvm 3.6.0 final from ^/vendor/llvm/dist, merge clang 3.6.0 final
from ^/vendor/clang/dist, and resolve conflicts.
Diffstat (limited to 'lib/clang/include')
| -rw-r--r-- | lib/clang/include/clang/Basic/Version.inc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/clang/include/clang/Basic/Version.inc b/lib/clang/include/clang/Basic/Version.inc index 775196c..c6d4a8e 100644 --- a/lib/clang/include/clang/Basic/Version.inc +++ b/lib/clang/include/clang/Basic/Version.inc @@ -6,6 +6,6 @@ #define CLANG_VERSION_PATCHLEVEL 0 #define CLANG_VENDOR "FreeBSD " -#define CLANG_VENDOR_SUFFIX " 20150219" +#define CLANG_VENDOR_SUFFIX " 20150225" -#define SVN_REVISION "229772" +#define SVN_REVISION "230434" |
