summaryrefslogtreecommitdiff
path: root/libgo/MERGE
diff options
context:
space:
mode:
authorian <ian@138bc75d-0d04-0410-961f-82ee72b054a4>2014-03-03 20:14:52 +0000
committerian <ian@138bc75d-0d04-0410-961f-82ee72b054a4>2014-03-03 20:14:52 +0000
commit2f501e2420760a9e62838d39fa7738e7d3284231 (patch)
treefb0eb29cec9de27ca80e274d703ef63dd94e37c3 /libgo/MERGE
parentd7f5615e21e38f5c85175b3cf2a1a6525d9d9558 (diff)
downloadgcc-2f501e2420760a9e62838d39fa7738e7d3284231.tar.gz
libgo: Update to Go 1.2.1 release.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@208286 138bc75d-0d04-0410-961f-82ee72b054a4
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 14d78eae0e9..cc27a799776 100644
--- a/libgo/MERGE
+++ b/libgo/MERGE
@@ -1,4 +1,4 @@
-65bf677ab8d8
+0ddbdc3c7ce2
The first line of this file holds the Mercurial revision number of the
last merge done from the master library sources.