summaryrefslogtreecommitdiff
path: root/libsanitizer/MERGE
diff options
context:
space:
mode:
authorkcc <kcc@138bc75d-0d04-0410-961f-82ee72b054a4>2012-11-27 14:01:46 +0000
committerkcc <kcc@138bc75d-0d04-0410-961f-82ee72b054a4>2012-11-27 14:01:46 +0000
commit2862f959a43c6d8652cfee7fb932828961cfb674 (patch)
tree689d358a17fc5081b93d1dae5d2cd4e1ee168c01 /libsanitizer/MERGE
parent645c25972d625cb0cfc2af2c4cdd76fbf96a826a (diff)
downloadgcc-2862f959a43c6d8652cfee7fb932828961cfb674.tar.gz
[libsanitizer] merge from upstream r168699
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@193849 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libsanitizer/MERGE')
-rw-r--r--libsanitizer/MERGE2
1 files changed, 1 insertions, 1 deletions
diff --git a/libsanitizer/MERGE b/libsanitizer/MERGE
index 05b4cf0d9b5..00ef0478dcd 100644
--- a/libsanitizer/MERGE
+++ b/libsanitizer/MERGE
@@ -1,4 +1,4 @@
-168514
+168699
The first line of this file holds the svn revision number of the
last merge done from the master library sources.