diff options
| author | Filippo Valsorda <filippo@golang.org> | 2019-02-27 15:39:47 -0500 |
|---|---|---|
| committer | Filippo Valsorda <filippo@golang.org> | 2019-02-27 15:39:47 -0500 |
| commit | a10558f870524965d720a3fee92ed0f0b8d096df (patch) | |
| tree | 770956b1dde3e97e9ca0d84fd05d8c6009a258c7 /api | |
| parent | 4ed8ad4d69d68da66fac413ed897bdde8d47057b (diff) | |
| parent | 88343530720a52c96b21f2bd5488c8fb607605d7 (diff) | |
| download | go-a10558f870524965d720a3fee92ed0f0b8d096df.tar.gz go-a10558f870524965d720a3fee92ed0f0b8d096df.zip | |
[dev.boringcrypto] all: merge master into dev.boringcrypto
This effectively reverts the golang.org/cl/161699 merge.
Change-Id: I7c982a97f3ae0015e2e148d4831912d058d682f8
Diffstat (limited to 'api')
| -rw-r--r-- | api/except.txt | 1 | ||||
| -rw-r--r-- | api/next.txt | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/api/except.txt b/api/except.txt index 637be18135..a608d5783e 100644 --- a/api/except.txt +++ b/api/except.txt @@ -457,3 +457,4 @@ pkg syscall (freebsd-arm-cgo), type Stat_t struct, Nlink uint16 pkg syscall (freebsd-arm-cgo), type Stat_t struct, Rdev uint32 pkg syscall (freebsd-arm-cgo), type Statfs_t struct, Mntfromname [88]int8 pkg syscall (freebsd-arm-cgo), type Statfs_t struct, Mntonname [88]int8 +pkg text/scanner, const GoTokens = 1012
\ No newline at end of file diff --git a/api/next.txt b/api/next.txt index e69de29bb2..aaea62d70b 100644 --- a/api/next.txt +++ b/api/next.txt @@ -0,0 +1,3 @@ +pkg text/scanner, const AllowNumberbars = 1024 +pkg text/scanner, const AllowNumberbars ideal-int +pkg text/scanner, const GoTokens = 2036 |