diff options
| author | Xiao Hang <rocking@google.com> | 2015-08-04 15:07:44 -0700 |
|---|---|---|
| committer | Xiao Hang <rocking@google.com> | 2015-08-04 15:07:44 -0700 |
| commit | 9fd0f1526fab9ee9b7e9d021185bc3507048a6d2 (patch) | |
| tree | a10acdb4210cf4d7dc770db88efc694aa35ec1de /src/google/protobuf/api.pb.cc | |
| parent | f5a3abc20487e423a7b3b2e13ad630e2d5026895 (diff) | |
| parent | dc80689af3951d078cb556588eece89dd6860c91 (diff) | |
| download | protobuf-9fd0f1526fab9ee9b7e9d021185bc3507048a6d2.tar.gz protobuf-9fd0f1526fab9ee9b7e9d021185bc3507048a6d2.tar.bz2 protobuf-9fd0f1526fab9ee9b7e9d021185bc3507048a6d2.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'src/google/protobuf/api.pb.cc')
| -rw-r--r-- | src/google/protobuf/api.pb.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/google/protobuf/api.pb.cc b/src/google/protobuf/api.pb.cc index 434320dc..0feddb31 100644 --- a/src/google/protobuf/api.pb.cc +++ b/src/google/protobuf/api.pb.cc @@ -123,8 +123,9 @@ void protobuf_AddDesc_google_2fprotobuf_2fapi_2eproto() { "quest_type_url\030\002 \001(\t\022\031\n\021request_streamin" "g\030\003 \001(\010\022\031\n\021response_type_url\030\004 \001(\t\022\032\n\022re" "sponse_streaming\030\005 \001(\010\022(\n\007options\030\006 \003(\0132" - "\027.google.protobuf.OptionB\'\n\023com.google.p" - "rotobufB\010ApiProtoP\001\242\002\003GPBb\006proto3", 513); + "\027.google.protobuf.OptionBH\n\023com.google.p" + "rotobufB\010ApiProtoP\001\242\002\003GPB\252\002\036Google.Proto" + "buf.WellKnownTypesb\006proto3", 546); ::google::protobuf::MessageFactory::InternalRegisterGeneratedFile( "google/protobuf/api.proto", &protobuf_RegisterTypes); Api::default_instance_ = new Api(); |