summaryrefslogtreecommitdiff
path: root/libgo/MERGE
diff options
context:
space:
mode:
authorIan Lance Taylor <ian@gcc.gnu.org>2019-02-26 15:38:12 +0000
committerIan Lance Taylor <ian@gcc.gnu.org>2019-02-26 15:38:12 +0000
commit4fd3c8aad91decbcb204c9c0900da15383945500 (patch)
treee4af19ac0fbd8be46db16d65a1a6b7b4815adf50 /libgo/MERGE
parent5c98b419f75a77545abcccb10743829704a4e5d5 (diff)
downloadgcc-4fd3c8aad91decbcb204c9c0900da15383945500.tar.gz
libgo: update to Go 1.12 release
Reviewed-on: https://go-review.googlesource.com/c/163742 From-SVN: r269216
Diffstat (limited to 'libgo/MERGE')
-rw-r--r--libgo/MERGE2
1 files changed, 1 insertions, 1 deletions
diff --git a/libgo/MERGE b/libgo/MERGE
index bf071a3a61e..1f0d2d4629a 100644
--- a/libgo/MERGE
+++ b/libgo/MERGE
@@ -1,4 +1,4 @@
-1af509d46e31a14e7ff17e23b1fd84250976b405
+05e77d41914d247a1e7caf37d7125ccaa5a53505
The first line of this file holds the git revision number of the
last merge done from the master library sources.