summaryrefslogtreecommitdiff
path: root/libsanitizer/MERGE
diff options
context:
space:
mode:
authorkcc <kcc@138bc75d-0d04-0410-961f-82ee72b054a4>2012-12-05 13:19:55 +0000
committerkcc <kcc@138bc75d-0d04-0410-961f-82ee72b054a4>2012-12-05 13:19:55 +0000
commit4ab070fc750612ffbe12b7a67de3fa3e8d9d81ea (patch)
tree1a9c1fa8fc461362f209a6c9b1abdadaacf74938 /libsanitizer/MERGE
parent14799b23a661479a4f3d2ec15471afb3618af00d (diff)
downloadgcc-4ab070fc750612ffbe12b7a67de3fa3e8d9d81ea.tar.gz
[libsanitizer] merge from upstream r169371
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@194221 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 00ef0478dcd..1512aa03802 100644
--- a/libsanitizer/MERGE
+++ b/libsanitizer/MERGE
@@ -1,4 +1,4 @@
-168699
+169371
The first line of this file holds the svn revision number of the
last merge done from the master library sources.