aboutsummaryrefslogtreecommitdiff
path: root/libgo/MERGE
diff options
context:
space:
mode:
authorIan Lance Taylor <ian@gcc.gnu.org>2017-01-23 22:18:42 +0000
committerIan Lance Taylor <ian@gcc.gnu.org>2017-01-23 22:18:42 +0000
commitc25edd44a04672573946138da9c8fdc8c0eef5fd (patch)
tree843ee0b88a49a9a81be51f8853f88eb3c11256b1 /libgo/MERGE
parent28826a66fb457b6655d66a40638a759617aa8673 (diff)
downloadgcc-c25edd44a04672573946138da9c8fdc8c0eef5fd.zip
gcc-c25edd44a04672573946138da9c8fdc8c0eef5fd.tar.gz
gcc-c25edd44a04672573946138da9c8fdc8c0eef5fd.tar.bz2
libgo: update to go1.8rc2
Fix a bug in the generation of the hash value in reflect.FuncOf. The merge script missed a bunch of testdata files over the years. Copy them over. Reviewed-on: https://go-review.googlesource.com/35570 From-SVN: r244835
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 a126b52..92541df 100644
--- a/libgo/MERGE
+++ b/libgo/MERGE
@@ -1,4 +1,4 @@
-3de6e96e4b8147f5267a2e8218a7c780b09a434f
+59f181b6fda68ece22882945853ca2df9dbf1c88
The first line of this file holds the git revision number of the
last merge done from the master library sources.