diff options
| author |  Adam Cozzette <acozzette@google.com> | 2016-06-29 15:23:27 -0700 |
|---|---|---|
| committer | Adam Cozzette <acozzette@google.com> | 2016-06-29 15:38:03 -0700 |
| commit | d64a2d9941c36a7bc2a7959ea10ab8363192ac14 (patch) | |
| tree | 52330d146ad63d3d70f3baade00d5d1fea8f5e0c /src/google/protobuf/util/json_format_proto3.proto | |
| parent | c18aa7795a2e02ef700ff8b039d94ecdcc33432f (diff) | |
Integrated internal changes from Google
This includes all internal changes from around May 20 to now.
Diffstat (limited to 'src/google/protobuf/util/json_format_proto3.proto')
| -rw-r--r-- | src/google/protobuf/util/json_format_proto3.proto | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/google/protobuf/util/json_format_proto3.proto b/src/google/protobuf/util/json_format_proto3.proto index a1e24c18..3835b30e 100644 --- a/src/google/protobuf/util/json_format_proto3.proto +++ b/src/google/protobuf/util/json_format_proto3.proto @@ -39,6 +39,7 @@ import "google/protobuf/wrappers.proto"; import "google/protobuf/struct.proto"; import "google/protobuf/any.proto"; import "google/protobuf/field_mask.proto"; +import "google/protobuf/unittest.proto"; enum EnumType { FOO = 0; @@ -174,3 +175,7 @@ message TestBoolValue { message TestCustomJsonName { int32 value = 1 [json_name = "@value"]; } + +message TestExtensions { + .protobuf_unittest.TestAllExtensions extensions = 1; +} |