aboutsummaryrefslogtreecommitdiff
path: root/gcc/go/gofrontend/MERGE
diff options
context:
space:
mode:
authorMartin Jambor <mjambor@suse.cz>2016-09-21 09:19:13 +0000
committerMartin Jambor <mjambor@suse.cz>2016-09-21 09:19:13 +0000
commit37ba4e6d655bfdb78f1c4cd481801d6769b74898 (patch)
tree3f5105c1f4eafe8d19b3e12116eee5e29c1df5e8 /gcc/go/gofrontend/MERGE
parent30dea3d0a5f8ed6ba06127ac90dd28ec1a97a07a (diff)
Merged trunk revision 240228 into the hsa branch
git-svn-id: https://gcc.gnu.org/svn/gcc/branches/hsa@240307 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 e6a0f8483f5..987aef7a6ef 100644
--- a/gcc/go/gofrontend/MERGE
+++ b/gcc/go/gofrontend/MERGE
@@ -1,4 +1,4 @@
-affb1bf5fcd7abf05993c54313d8000b93a08d4a
+b34c93bf00ec4f2ad043ec89ff96989e0d1b26aa
The first line of this file holds the git revision number of the last
merge done from the gofrontend repository.