diff options
author | Kostya Serebryany <kcc@google.com> | 2012-11-23 14:46:25 +0000 |
---|---|---|
committer | Kostya Serebryany <kcc@gcc.gnu.org> | 2012-11-23 14:46:25 +0000 |
commit | e297eb600dd52acd73fb64ca45905b68f4e9b99b (patch) | |
tree | a354102cd1c27b09eefe0b04f517d4ecac5bc566 /libsanitizer/MERGE | |
parent | 8ddf5c28ea6be09213739c94f9765019be476bb0 (diff) | |
download | gcc-e297eb600dd52acd73fb64ca45905b68f4e9b99b.zip gcc-e297eb600dd52acd73fb64ca45905b68f4e9b99b.tar.gz gcc-e297eb600dd52acd73fb64ca45905b68f4e9b99b.tar.bz2 |
[libsanitizer] merge from upstream r168514
From-SVN: r193756
Diffstat (limited to 'libsanitizer/MERGE')
-rw-r--r-- | libsanitizer/MERGE | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/libsanitizer/MERGE b/libsanitizer/MERGE new file mode 100644 index 0000000..05b4cf0 --- /dev/null +++ b/libsanitizer/MERGE @@ -0,0 +1,4 @@ +168514 + +The first line of this file holds the svn revision number of the +last merge done from the master library sources. |