diff options
| author | Jeremy Faller <jeremy@golang.org> | 2020-09-30 17:57:14 -0400 |
|---|---|---|
| committer | Jeremy Faller <jeremy@golang.org> | 2020-09-30 18:00:58 -0400 |
| commit | 91e4d2d57bc341dd82c98247117114c851380aef (patch) | |
| tree | 15a2d023cdc63543cf8a6e99f8a561c0a0459000 /src/cmd/go.mod | |
| parent | c863e14a6c15e174ac0979ddd7f9530d6a4ec9cc (diff) | |
| parent | 846dce9d05f19a1f53465e62a304dea21b99f910 (diff) | |
| download | go-91e4d2d57bc341dd82c98247117114c851380aef.tar.gz go-91e4d2d57bc341dd82c98247117114c851380aef.zip | |
[dev.link] Merge branch 'master' into dev.link
2 conflicts, that make sense.
src/cmd/internal/obj/objfile.go
src/cmd/link/internal/loader/loader.go
Change-Id: Ib224e2d248cb568fa1e888af79dd908b2f5e05ff
Diffstat (limited to 'src/cmd/go.mod')
| -rw-r--r-- | src/cmd/go.mod | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/src/cmd/go.mod b/src/cmd/go.mod index 0952dbb84c..59d6152e2a 100644 --- a/src/cmd/go.mod +++ b/src/cmd/go.mod @@ -1,14 +1,13 @@ module cmd -go 1.15 +go 1.16 require ( github.com/google/pprof v0.0.0-20200229191704-1ebb73c60ed3 github.com/ianlancetaylor/demangle v0.0.0-20200414190113-039b1ae3a340 // indirect - golang.org/x/arch v0.0.0-20200511175325-f7c78586839d - golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9 + golang.org/x/arch v0.0.0-20200826200359-b19915210f00 + golang.org/x/crypto v0.0.0-20200820211705-5c72a883971a golang.org/x/mod v0.3.1-0.20200828183125-ce943fd02449 - golang.org/x/sys v0.0.0-20200501145240-bc7a7d42d5c3 // indirect - golang.org/x/tools v0.0.0-20200901153117-6e59e24738da - golang.org/x/xerrors v0.0.0-20200806184451-1a77d5e9f316 // indirect + golang.org/x/sys v0.0.0-20200923182605-d9f96fdee20d // indirect + golang.org/x/tools v0.0.0-20200918232735-d647fc253266 ) |