summaryrefslogtreecommitdiff
path: root/gcc/go/gofrontend/MERGE
diff options
context:
space:
mode:
authorian <ian@138bc75d-0d04-0410-961f-82ee72b054a4>2016-07-26 01:38:33 +0000
committerian <ian@138bc75d-0d04-0410-961f-82ee72b054a4>2016-07-26 01:38:33 +0000
commit98cada78e5430ca047838e0fda0541c293c04d16 (patch)
treefc45abfa48cd9a351682f5aa1648ecbea957c5f8 /gcc/go/gofrontend/MERGE
parentf4ffbc43eb1927ebc2afddb1c5cf9cccc56e72c1 (diff)
downloadgcc-98cada78e5430ca047838e0fda0541c293c04d16.tar.gz
os/user: fix Solaris declaration.
Patch from Rainer Orth. Reviewed-on: https://go-review.googlesource.com/25210 git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@238742 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 99a68baee78..320a0913120 100644
--- a/gcc/go/gofrontend/MERGE
+++ b/gcc/go/gofrontend/MERGE
@@ -1,4 +1,4 @@
-b156d71ad75a1b73d0ed805a5370a297648d9270
+ffd91f9f72fb93147d4ccce9e4c4a59e4c3c2e62
The first line of this file holds the git revision number of the last
merge done from the gofrontend repository.