summaryrefslogtreecommitdiff
path: root/libsanitizer/MERGE
diff options
context:
space:
mode:
authorkcc <kcc@138bc75d-0d04-0410-961f-82ee72b054a4>2012-12-06 14:43:11 +0000
committerkcc <kcc@138bc75d-0d04-0410-961f-82ee72b054a4>2012-12-06 14:43:11 +0000
commit1a8a3492ad2746da195565a50147c57b45e79cd0 (patch)
tree1f745ce7339c78271d4e10927b85f87464a29e01 /libsanitizer/MERGE
parenta0db5e0bd8f1348278937fe0ec60dec4db27a952 (diff)
downloadgcc-1a8a3492ad2746da195565a50147c57b45e79cd0.tar.gz
[libsanitizer] merge from upstream r169392
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@194255 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 1512aa03802..071edae3249 100644
--- a/libsanitizer/MERGE
+++ b/libsanitizer/MERGE
@@ -1,4 +1,4 @@
-169371
+169392
The first line of this file holds the svn revision number of the
last merge done from the master library sources.