summaryrefslogtreecommitdiff
path: root/libgo/MERGE
diff options
context:
space:
mode:
authorIan Lance Taylor <ian@gcc.gnu.org>2017-01-27 15:01:57 +0000
committerIan Lance Taylor <ian@gcc.gnu.org>2017-01-27 15:01:57 +0000
commit42f20102eff9b4e5cfad7cd21505a204df085418 (patch)
treea9cbfe963d60748568459d9a15c3c4c1086bdac2 /libgo/MERGE
parent3f54004b095d1cd513e63753ee0f8f9f13698347 (diff)
libgo: update to go1.8rc3
Reviewed-on: https://go-review.googlesource.com/35844 From-SVN: r244981
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 92541dfc6e3..fa155a238d6 100644
--- a/libgo/MERGE
+++ b/libgo/MERGE
@@ -1,4 +1,4 @@
-59f181b6fda68ece22882945853ca2df9dbf1c88
+2a5f65a98ca483aad2dd74dc2636a7baecc59cf2
The first line of this file holds the git revision number of the
last merge done from the master library sources.