aboutsummaryrefslogtreecommitdiff
path: root/libsanitizer/MERGE
diff options
context:
space:
mode:
authorkcc <kcc@138bc75d-0d04-0410-961f-82ee72b054a4>2012-11-23 14:46:25 +0000
committerkcc <kcc@138bc75d-0d04-0410-961f-82ee72b054a4>2012-11-23 14:46:25 +0000
commit0d996a11d9b5be7a52d77016de51910146ceaa90 (patch)
treea354102cd1c27b09eefe0b04f517d4ecac5bc566 /libsanitizer/MERGE
parenta46419387192ae39f45cfeca2ec0afe6f872956e (diff)
[libsanitizer] merge from upstream r168514
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@193756 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libsanitizer/MERGE')
-rw-r--r--libsanitizer/MERGE4
1 files changed, 4 insertions, 0 deletions
diff --git a/libsanitizer/MERGE b/libsanitizer/MERGE
new file mode 100644
index 00000000000..05b4cf0d9b5
--- /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.