diff options
| author | Jisi Liu <jisi.liu@gmail.com> | 2017-11-13 10:48:40 -0800 |
|---|---|---|
| committer | Jisi Liu <jisi.liu@gmail.com> | 2017-11-13 10:48:40 -0800 |
| commit | 4041600aa17563aead04ad2abf479b5a6834b4c7 (patch) | |
| tree | 6dba45903071946a759d66b960ac71e5dd61ae2a /CHANGES.txt | |
| parent | 4493595f8c77e9d094351987111cbf4aa2246f37 (diff) | |
| parent | 2761122b810fe8861004ae785cc3ab39f384d342 (diff) | |
| download | protobuf-4041600aa17563aead04ad2abf479b5a6834b4c7.tar.gz protobuf-4041600aa17563aead04ad2abf479b5a6834b4c7.tar.bz2 protobuf-4041600aa17563aead04ad2abf479b5a6834b4c7.zip | |
Merge branch '3.5.x' of github.com:google/protobuf into 3.5.x
Diffstat (limited to 'CHANGES.txt')
| -rw-r--r-- | CHANGES.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/CHANGES.txt b/CHANGES.txt index fe2de89d..ea3252bb 100644 --- a/CHANGES.txt +++ b/CHANGES.txt @@ -62,6 +62,7 @@ C# * Added unknown field support in JsonParser. * Fixed oneof message field merge. + * Simplify parsing messages from array slices. Ruby * Unknown fields are now preserved by default. |