diff options
| author | Jisi Liu <jisi.liu@gmail.com> | 2015-08-21 11:42:27 -0700 |
|---|---|---|
| committer | Jisi Liu <jisi.liu@gmail.com> | 2015-08-21 11:44:49 -0700 |
| commit | c3bc155aceda36ecb01cde2367a3b427f2d7ce40 (patch) | |
| tree | 195d74745dad40a57d49bf718f50c7751336a405 /src/google/protobuf/type.pb.cc | |
| parent | b0f661181d10bddc08e380992590a1cdd92be92b (diff) | |
| parent | eb65c69e14fb711208ad5111cb9672f00864bb6d (diff) | |
| download | protobuf-c3bc155aceda36ecb01cde2367a3b427f2d7ce40.tar.gz protobuf-c3bc155aceda36ecb01cde2367a3b427f2d7ce40.tar.bz2 protobuf-c3bc155aceda36ecb01cde2367a3b427f2d7ce40.zip | |
Merge branch 'master' of github.com:google/protobuf
Change-Id: If3fb07754a734bae610d95124528e073515ac525
Diffstat (limited to 'src/google/protobuf/type.pb.cc')
| -rw-r--r-- | src/google/protobuf/type.pb.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/google/protobuf/type.pb.cc b/src/google/protobuf/type.pb.cc index 7e8ffa9e..395553c6 100644 --- a/src/google/protobuf/type.pb.cc +++ b/src/google/protobuf/type.pb.cc @@ -230,9 +230,10 @@ void protobuf_AddDesc_google_2fprotobuf_2ftype_2eproto() { "\002 \001(\005\022(\n\007options\030\003 \003(\0132\027.google.protobuf" ".Option\";\n\006Option\022\014\n\004name\030\001 \001(\t\022#\n\005value" "\030\002 \001(\0132\024.google.protobuf.Any*.\n\006Syntax\022\021" - "\n\rSYNTAX_PROTO2\020\000\022\021\n\rSYNTAX_PROTO3\020\001B+\n\023" + "\n\rSYNTAX_PROTO2\020\000\022\021\n\rSYNTAX_PROTO3\020\001BL\n\023" "com.google.protobufB\tTypeProtoP\001\240\001\001\242\002\003GP" - "Bb\006proto3", 1489); + "B\252\002\036Google.Protobuf.WellKnownTypesb\006prot" + "o3", 1522); ::google::protobuf::MessageFactory::InternalRegisterGeneratedFile( "google/protobuf/type.proto", &protobuf_RegisterTypes); Type::default_instance_ = new Type(); |