summaryrefslogtreecommitdiff
path: root/libgo/MERGE
diff options
context:
space:
mode:
authorIan Lance Taylor <ian@gcc.gnu.org>2014-07-12 00:01:09 +0000
committerIan Lance Taylor <ian@gcc.gnu.org>2014-07-12 00:01:09 +0000
commit2fa39ad859e59a5ad5796e522a4842717b2f6e0c (patch)
tree783acf11ed4625d6499f731501d984f25fa103fc /libgo/MERGE
parentca76ae5c35f58f0ea40f656d3e555f2c740cf4ec (diff)
runtime: Merge master revision 19185.
This revision renames several files in the runtime directory from .c to .goc. From-SVN: r212472
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 2ef8f7a9489..23732d0fc85 100644
--- a/libgo/MERGE
+++ b/libgo/MERGE
@@ -1,4 +1,4 @@
-50c8fc924389
+63484e8b6b76
The first line of this file holds the Mercurial revision number of the
last merge done from the master library sources.