summaryrefslogtreecommitdiff
path: root/libgo/MERGE
diff options
context:
space:
mode:
authorian <ian@138bc75d-0d04-0410-961f-82ee72b054a4>2011-11-29 23:02:54 +0000
committerian <ian@138bc75d-0d04-0410-961f-82ee72b054a4>2011-11-29 23:02:54 +0000
commitc288b727832badcce3cf9d1cd2f237cd737fb956 (patch)
tree3cbc69464b9e65b6abf2f6adbda2845f1577b756 /libgo/MERGE
parent836d1caca68ca5b42803607bcd108a9e70f1904f (diff)
downloadgcc-c288b727832badcce3cf9d1cd2f237cd737fb956.tar.gz
libgo: update to weekly.2011-10-25
Changes were mainly straightforward to merge. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@181824 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 8ba17deb09e..2a86f2f86ed 100644
--- a/libgo/MERGE
+++ b/libgo/MERGE
@@ -1,4 +1,4 @@
-6d7136d74b65
+941b8015061a
The first line of this file holds the Mercurial revision number of the
last merge done from the master library sources.