diff options
| author | Jisi Liu <liujisi@google.com> | 2017-08-21 10:39:27 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-08-21 10:39:27 -0700 |
| commit | ba4e54724d2e6a1881c4fe88664d81fbacaf8c08 (patch) | |
| tree | 5451ab616f035b92d006e51ec01b4c0dabb3f6d0 /js/proto3_test.proto | |
| parent | 472f700884a2cd4e9b621c5e4b706a9b6de7c870 (diff) | |
| parent | 139775ccc040a07e07c5407e34834dab27928cbc (diff) | |
| download | protobuf-ba4e54724d2e6a1881c4fe88664d81fbacaf8c08.tar.gz protobuf-ba4e54724d2e6a1881c4fe88664d81fbacaf8c08.tar.bz2 protobuf-ba4e54724d2e6a1881c4fe88664d81fbacaf8c08.zip | |
Merge pull request #3529 from pherl/merge3.4.x
Merge 3.4.x into master
Diffstat (limited to 'js/proto3_test.proto')
| -rw-r--r-- | js/proto3_test.proto | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/js/proto3_test.proto b/js/proto3_test.proto index acb67164..0d073ea0 100644 --- a/js/proto3_test.proto +++ b/js/proto3_test.proto @@ -86,4 +86,5 @@ enum Proto3Enum { PROTO3_FOO = 0; PROTO3_BAR = 1; PROTO3_BAZ = 2; + MSG_PROTO3_BAH = 3; } |