aboutsummaryrefslogtreecommitdiff
path: root/gcc/go/gofrontend/MERGE
diff options
context:
space:
mode:
authorMartin Jambor <mjambor@suse.cz>2016-11-01 19:03:07 +0000
committerMartin Jambor <mjambor@suse.cz>2016-11-01 19:03:07 +0000
commit574d0a98e847ed04449cb80a9584db56cdd94ce6 (patch)
treef6f4a311de1a25e35ed01b2065a9e5c234fbb44a /gcc/go/gofrontend/MERGE
parent52841aef869b297cfe6e544948376597f0e14027 (diff)
Merged trunk revision 241734 into the hsa branch
git-svn-id: https://gcc.gnu.org/svn/gcc/branches/hsa@241755 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 7d0643c7c4b..a03ed585267 100644
--- a/gcc/go/gofrontend/MERGE
+++ b/gcc/go/gofrontend/MERGE
@@ -1,4 +1,4 @@
-880cb0a45590d992880fc6aabc7484e54c817eeb
+c353ffbe18d1538cac7f2a3fcefb846dbf1a6591
The first line of this file holds the git revision number of the last
merge done from the gofrontend repository.