aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gcc/go/gofrontend/MERGE2
-rw-r--r--gcc/go/gofrontend/types.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/gcc/go/gofrontend/MERGE b/gcc/go/gofrontend/MERGE
index 12dd965..4335a28 100644
--- a/gcc/go/gofrontend/MERGE
+++ b/gcc/go/gofrontend/MERGE
@@ -1,4 +1,4 @@
-08cd59a502127da776e076a8a37016a668ef27fa
+23f39fa450b84e81c5c39a7a840fcc88eeeea764
The first line of this file holds the git revision number of the last
merge done from the gofrontend repository.
diff --git a/gcc/go/gofrontend/types.h b/gcc/go/gofrontend/types.h
index 4bc5497b..e3343cf 100644
--- a/gcc/go/gofrontend/types.h
+++ b/gcc/go/gofrontend/types.h
@@ -3086,7 +3086,7 @@ class Interface_type : public Type
return this->all_methods_ == NULL;
}
- // Return the list of locally defined methos. This will return NULL
+ // Return the list of locally defined methods. This will return NULL
// for an empty interface. Embedded interfaces will appear in this
// list as an entry with no name.
const Typed_identifier_list*