diff options
author | Qiwen Zhao <zhao@google.com> | 2015-03-22 00:39:26 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2015-03-22 00:39:26 +0000 |
commit | e40224ab5a113158a1b429199dcd28d8680a7e6a (patch) | |
tree | 8b02f0d164e41d6e5082fa671d8addb3c70a2aab /src/google/protobuf/compiler/cpp/cpp_options.h | |
parent | 847d91396504629dbfb3cd597acd61045dd630e2 (diff) | |
parent | 25f140b3e3d38af172ba484561a5da1667325629 (diff) | |
download | external_protobuf-e40224ab5a113158a1b429199dcd28d8680a7e6a.zip external_protobuf-e40224ab5a113158a1b429199dcd28d8680a7e6a.tar.gz external_protobuf-e40224ab5a113158a1b429199dcd28d8680a7e6a.tar.bz2 |
am 25f140b3: (-s ours) Reset back to c6d612a. DO NOT MERGE ANYWHERE.
* commit '25f140b3e3d38af172ba484561a5da1667325629':
Inline unknownFieldData{Equals,HashCode} to generated code.
Expose generate_clear as an option.
Diffstat (limited to 'src/google/protobuf/compiler/cpp/cpp_options.h')
0 files changed, 0 insertions, 0 deletions