aboutsummaryrefslogtreecommitdiff
path: root/libgo/MERGE
diff options
context:
space:
mode:
authorIan Lance Taylor <ian@gcc.gnu.org>2015-10-31 15:23:52 +0000
committerIan Lance Taylor <ian@gcc.gnu.org>2015-10-31 15:23:52 +0000
commitb9702967ee6ce84303296b111f596fefab3a60a9 (patch)
tree1d06e8295c2545767c9506ed39fd1c6ac8829167 /libgo/MERGE
parent67376cd2a504c8357d4433f8262b819a8f5af0d9 (diff)
downloadgcc-b9702967ee6ce84303296b111f596fefab3a60a9.zip
gcc-b9702967ee6ce84303296b111f596fefab3a60a9.tar.gz
gcc-b9702967ee6ce84303296b111f596fefab3a60a9.tar.bz2
libgo: Update from Go 1.5 to Go 1.5.1.
Reviewed-on: https://go-review.googlesource.com/16527 From-SVN: r229624
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 af7e452..ea32fc1 100644
--- a/libgo/MERGE
+++ b/libgo/MERGE
@@ -1,4 +1,4 @@
-bb03defe933c89fee44be675d7aa0fbd893ced30
+f2e4c8b5fb3660d793b2c545ef207153db0a34b1
The first line of this file holds the git revision number of the
last merge done from the master library sources.