aboutsummaryrefslogtreecommitdiff
path: root/libgo/MERGE
diff options
context:
space:
mode:
authorIan Lance Taylor <ian@gcc.gnu.org>2019-03-18 20:27:59 +0000
committerIan Lance Taylor <ian@gcc.gnu.org>2019-03-18 20:27:59 +0000
commita8b58d84bf4fd9c925a835ba39c1c552383bc61b (patch)
tree97d68e0e70fb780b04f3171a0f53102a39c23f41 /libgo/MERGE
parent891cd9e3b9a89b0461fb838d38c51b6fab596337 (diff)
downloadgcc-a8b58d84bf4fd9c925a835ba39c1c552383bc61b.zip
gcc-a8b58d84bf4fd9c925a835ba39c1c552383bc61b.tar.gz
gcc-a8b58d84bf4fd9c925a835ba39c1c552383bc61b.tar.bz2
libgo: update to Go 1.12.1
Reviewed-on: https://go-review.googlesource.com/c/gofrontend/+/167749 From-SVN: r269780
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 1f0d2d4..d456361 100644
--- a/libgo/MERGE
+++ b/libgo/MERGE
@@ -1,4 +1,4 @@
-05e77d41914d247a1e7caf37d7125ccaa5a53505
+0380c9ad38843d523d9c9804fe300cb7edd7cd3c
The first line of this file holds the git revision number of the
last merge done from the master library sources.