| commit | d64a2d9941c36a7bc2a7959ea10ab8363192ac14 | [log] [tgz] |
|---|---|---|
| author | Adam Cozzette <acozzette@google.com> | Wed Jun 29 15:23:27 2016 -0700 |
| committer | Adam Cozzette <acozzette@google.com> | Wed Jun 29 15:38:03 2016 -0700 |
| tree | 52330d146ad63d3d70f3baade00d5d1fea8f5e0c | |
| parent | c18aa7795a2e02ef700ff8b039d94ecdcc33432f [diff] [blame] |
Integrated internal changes from Google This includes all internal changes from around May 20 to now.
diff --git a/js/test.proto b/js/test.proto index 6b9dc89..06eb79a 100644 --- a/js/test.proto +++ b/js/test.proto
@@ -160,6 +160,7 @@ optional string str = 1; optional Simple1 simple1 = 3; repeated Simple1 simple2 = 5; + optional bytes bytes_field = 6; optional string unused = 7; extensions 10 to max; }