summaryrefslogtreecommitdiff
path: root/libgo/MERGE
diff options
context:
space:
mode:
authorian <ian@138bc75d-0d04-0410-961f-82ee72b054a4>2015-03-06 16:19:05 +0000
committerian <ian@138bc75d-0d04-0410-961f-82ee72b054a4>2015-03-06 16:19:05 +0000
commitd145bc231855ad5d6df1feb0bc7f283e4c404a90 (patch)
tree122e64d46042099f2d5b39e31532f3d0358b5ad3 /libgo/MERGE
parentf91d0326c12847ab2f48285f865db5793db5d1bc (diff)
downloadgcc-d145bc231855ad5d6df1feb0bc7f283e4c404a90.tar.gz
libgo: Upgrade to Go 1.4.2 release.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@221245 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libgo/MERGE')
-rw-r--r--libgo/MERGE4
1 files changed, 2 insertions, 2 deletions
diff --git a/libgo/MERGE b/libgo/MERGE
index 0e12671be4e..260f8cf8e59 100644
--- a/libgo/MERGE
+++ b/libgo/MERGE
@@ -1,4 +1,4 @@
-14854533dcc7
+883bc6ed0ea815293fe6309d66f967ea60630e87
-The first line of this file holds the Mercurial revision number of the
+The first line of this file holds the git revision number of the
last merge done from the master library sources.