aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorIan Lance Taylor <ian@gcc.gnu.org>2017-09-18 22:35:40 +0000
committerIan Lance Taylor <ian@gcc.gnu.org>2017-09-18 22:35:40 +0000
commitd2b4864f55092b342dae9f2d147939f7ce08dfdc (patch)
treef71c42d01806bac6a3b23bd42b06acbf5461b06c /gcc
parent72d4fc12c068f59bc865ac8dc423be07a2794f6b (diff)
parent4d034b52593c40db9ceeaa531eefdb628fa29ce5 (diff)
downloadgcc-d2b4864f55092b342dae9f2d147939f7ce08dfdc.zip
gcc-d2b4864f55092b342dae9f2d147939f7ce08dfdc.tar.gz
gcc-d2b4864f55092b342dae9f2d147939f7ce08dfdc.tar.bz2
Merge from trunk revision 252954.
From-SVN: r252955
Diffstat (limited to 'gcc')
-rw-r--r--gcc/go/gofrontend/MERGE2
1 files changed, 1 insertions, 1 deletions
diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE
index 4081aa9..27bcb6e 100644
--- a/gcc/go/gofrontend/MERGE
+++ b/gcc/go/gofrontend/MERGE
@@ -1,4 +1,4 @@
-abe58fdc529378706d65d6b22e4871646eb9023e
+be69546afcac182cc93c569bc96665f0ef72d66a
The first line of this file holds the git revision number of the last
merge done from the gofrontend repository.