summaryrefslogtreecommitdiff
path: root/libsanitizer/MERGE
diff options
context:
space:
mode:
authorkcc <kcc@138bc75d-0d04-0410-961f-82ee72b054a4>2014-09-23 17:59:53 +0000
committerkcc <kcc@138bc75d-0d04-0410-961f-82ee72b054a4>2014-09-23 17:59:53 +0000
commita9586c9cc10d268c2cd7642d03a75bb283b0e266 (patch)
treedfe8acd36f160811afc54c8eaf16e8160ba8bd70 /libsanitizer/MERGE
parent4b9426aa0590d7761688e00e9da9393e228dd830 (diff)
downloadgcc-a9586c9cc10d268c2cd7642d03a75bb283b0e266.tar.gz
[libsanitizer merge from upstream r218156]
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@215527 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 84e88e10b77..48a7f26d32d 100644
--- a/libsanitizer/MERGE
+++ b/libsanitizer/MERGE
@@ -1,4 +1,4 @@
-209283
+218156
The first line of this file holds the svn revision number of the
last merge done from the master library sources.