aboutsummaryrefslogtreecommitdiff
path: root/gcc/go/gofrontend/MERGE
diff options
context:
space:
mode:
authorMartin Jambor <mjambor@suse.cz>2016-06-29 16:53:56 +0000
committerMartin Jambor <mjambor@suse.cz>2016-06-29 16:53:56 +0000
commitab9b316a08275b1c14ea16dfc07d712bd2418124 (patch)
tree2aa803fc42e7bc2ac3587bcec19f3940485f1f60 /gcc/go/gofrontend/MERGE
parentdaf404b27549e063255ae16e3df741c9031c2840 (diff)
Merged trunk revision 237818 into the hsa branch
git-svn-id: https://gcc.gnu.org/svn/gcc/branches/hsa@237856 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/go/gofrontend/MERGE')
-rw-r--r--gcc/go/gofrontend/MERGE2
1 files changed, 1 insertions, 1 deletions
diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE
index 8e0fd0fb63e..e2a7a8d36ee 100644
--- a/gcc/go/gofrontend/MERGE
+++ b/gcc/go/gofrontend/MERGE
@@ -1,4 +1,4 @@
-a87af72757d9a2e4479062a459a41d4540398005
+1f2f2c77c7ec92efa254e07162a8fc0d22a550e7
The first line of this file holds the git revision number of the last
merge done from the gofrontend repository.