aboutsummaryrefslogtreecommitdiff
path: root/gcc/go
diff options
context:
space:
mode:
authorMartin Liska <mliska@suse.cz>2021-07-12 11:40:46 +0200
committerMartin Liska <mliska@suse.cz>2021-07-12 11:40:46 +0200
commit993a6fb652c7b82ef4fa8a3fdc0dbfe05987d829 (patch)
treee367854da02f55b4abf387b818fda2f504f198ef /gcc/go
parent7445abec5d383d37a2f827657dafa12053179c6e (diff)
parent9b8b37d1b6301855213b8d4860feaeb74d464c6b (diff)
downloadgcc-993a6fb652c7b82ef4fa8a3fdc0dbfe05987d829.zip
gcc-993a6fb652c7b82ef4fa8a3fdc0dbfe05987d829.tar.gz
gcc-993a6fb652c7b82ef4fa8a3fdc0dbfe05987d829.tar.bz2
Merge branch 'master' into devel/sphinx
Diffstat (limited to 'gcc/go')
-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 ab1384d..4d0f44f 100644
--- a/gcc/go/gofrontend/MERGE
+++ b/gcc/go/gofrontend/MERGE
@@ -1,4 +1,4 @@
-01cb2b5e69a2d08ef3cc1ea023c22ed9b79f5114
+adcf10890833026437a94da54934ce50c0018309
The first line of this file holds the git revision number of the last
merge done from the gofrontend repository.