[Pkg-protobuf-devel] [pkg-protobuf] annotated tag upstream/3.0.0_alpha-1 created (now 0915d52)
Iustin Pop
iustin at moszumanska.debian.org
Sun May 8 07:24:26 UTC 2016
This is an automated email from the git hooks/post-receive script.
iustin pushed a change to annotated tag upstream/3.0.0_alpha-1
in repository pkg-protobuf.
at 0915d52 (tag)
tagging 5cf5dbaa4d7f1587b589c85228e44651a5db2380 (commit)
replaces upstream/2.6.1
tagged by Robert Edmonds
on Sat Feb 28 12:17:21 2015 -0500
- Log -----------------------------------------------------------------
Upstream version 3.0.0~alpha-1
Adam Bliss (2):
Adds a few utilities to ProtoBufUtil, integrating over from mainline
am a67f19de: Adds a few utilities to ProtoBufUtil, integrating over from mainline
Adam Metcalf (5):
am 380d1b5a: Fix the merge conflict leftovers.
am 4104f751: am 380d1b5a: Fix the merge conflict leftovers.
am 67f3f6aa: am 4104f751: am 380d1b5a: Fix the merge conflict leftovers.
am c0bc136b: am 67f3f6aa: am 4104f751: am 380d1b5a: Fix the merge conflict leftovers.
am cd22086d: am c0bc136b: am 67f3f6aa: am 4104f751: am 380d1b5a: Fix the merge conflict leftovers.
Andrew Flynn (12):
Add toString() method to MessageNano.
Fix some indenting issues with set__() function
Nano: don't generate accessor methods for nested methods
Fix MessageNanoPrinter for accessors
Merge "Fix MessageNanoPrinter for accessors"
am e7741c06: Merge "Fix MessageNanoPrinter for accessors"
am a896c1d8: am e7741c06: Merge "Fix MessageNanoPrinter for accessors"
am 81d0f437: am a896c1d8: am e7741c06: Merge "Fix MessageNanoPrinter for accessors"
am db4556ed: am 81d0f437: am a896c1d8: am e7741c06: Merge "Fix MessageNanoPrinter for accessors"
am 11b030c3: am db4556ed: am 81d0f437: am a896c1d8: am e7741c06: Merge "Fix MessageNanoPrinter for accessors"
am 3628a851: am 11b030c3: am db4556ed: am 81d0f437: am a896c1d8: am e7741c06: Merge "Fix MessageNanoPrinter for accessors"
am a155ce7e: am 3628a851: am 11b030c3: am db4556ed: am 81d0f437: am a896c1d8: am e7741c06: Merge "Fix MessageNanoPrinter for accessors"
Andrew Paprocki (4):
Fixed IBM xlC compiler error due to missing prefix.
Add atomicops for AIX/POWER + IBM xlC compiler.
Added contributor and updated README to add AIX.
Modify tests to compile on AIX with xlC compiler.
Aurash Mahbod (1):
Allow for ref-type arrays containing null elements.
Austin Schuh (2):
Fixed Unused Parameter warning in headers.
Fixed Unused Parameter warning in compiler headers.
Baligh Uddin (6):
keep history after reset to 1fd235cbb5975e117909c73e5e3a579ae4c28dce
am 6c915d3a: keep history after reset to 1fd235cbb5975e117909c73e5e3a579ae4c28dce
am 39467629: am 6c915d3a: keep history after reset to 1fd235cbb5975e117909c73e5e3a579ae4c28dce
am f8b1f831: am 39467629: am 6c915d3a: keep history after reset to 1fd235cbb5975e117909c73e5e3a579ae4c28dce
am 57e2ee78: am f8b1f831: am 39467629: am 6c915d3a: keep history after reset to 1fd235cbb5975e117909c73e5e3a579ae4c28dce
am b088989c: am 57e2ee78: am f8b1f831: am 39467629: am 6c915d3a: keep history after reset to 1fd235cbb5975e117909c73e5e3a579ae4c28dce
Behrooz Khorashadi (3):
Added an API method in FieldData to allow access to the UnknownField data
Merge "Added an API method in FieldData to allow access to the UnknownField data"
am dbb9c303: Merge "Added an API method in FieldData to allow access to the UnknownField data"
Bill Yi (8):
Merge commit 'ba89934bdae7f4256c94a0a24992903a114e764f' into HEAD
am ddeaf256: Merge commit \'ba89934bdae7f4256c94a0a24992903a114e764f\' into HEAD
am 9dde6a6d: am ddeaf256: Merge commit \'ba89934bdae7f4256c94a0a24992903a114e764f\' into HEAD
am f4af48ae: am 9dde6a6d: am ddeaf256: Merge commit \'ba89934bdae7f4256c94a0a24992903a114e764f\' into HEAD
am 8b5d62a4: am f4af48ae: am 9dde6a6d: am ddeaf256: Merge commit \'ba89934bdae7f4256c94a0a24992903a114e764f\' into HEAD
am 0e54db6b: am 8b5d62a4: am f4af48ae: am 9dde6a6d: am ddeaf256: Merge commit \'ba89934bdae7f4256c94a0a24992903a114e764f\' into HEAD
am d0f3ba60: am 0e54db6b: am 8b5d62a4: am f4af48ae: am 9dde6a6d: am ddeaf256: Merge commit \'ba89934bdae7f4256c94a0a24992903a114e764f\' into HEAD
am 7f3f30e9: am d0f3ba60: am 0e54db6b: am 8b5d62a4: am f4af48ae: am 9dde6a6d: am ddeaf256: Merge commit \'ba89934bdae7f4256c94a0a24992903a114e764f\' into HEAD
Brian Duff (24):
Fix javanano compiler generating uncompileable java code. This happened
Fix enum field references with java_multiple_files.
Nano support for extensions and unknown fields.
Make it possible to use MessageNano.mergeFrom without casting.
Add reftypes field generator option.
Protect against null repeated fields.
Implement hashCode() and equals() behind a generator option.
Don't return NULL from {Boxed}PrimitiveTypeName.
Merge "Don't return NULL from {Boxed}PrimitiveTypeName."
am 95d99df4: Merge "Don\'t return NULL from {Boxed}PrimitiveTypeName."
Add MessageNano.messageNanoEquals().
Merge "Add MessageNano.messageNanoEquals()."
am ddf016d8: Merge "Add MessageNano.messageNanoEquals()."
Make the tag field public.
Merge "Make the tag field public."
am c4e7b92f: Merge "Make the tag field public."
Merge "Includes a MessageNano subclass's name's hashCode in hashCode calculations."
am d3a8acb9: Merge "Includes a MessageNano subclass\'s name\'s hashCode in hashCode calculations."
Adds a primitive enum mode for reftypes.
Merge "Adds a primitive enum mode for reftypes."
am 7d1ca13f: Merge "Adds a primitive enum mode for reftypes."
Change reftypes_primitive_enums to reftypes_compat_mode.
Merge "Change reftypes_primitive_enums to reftypes_compat_mode."
am 9be7e740: Merge "Change reftypes_primitive_enums to reftypes_compat_mode."
Chris Smith (1):
Allow NaN/+inf/-inf defaults in micro/nano.
Dan Albert (2):
Add platform versions of the protobuf libraries.
Merge "Add platform versions of the protobuf libraries."
Dan Egnor (1):
The j2me protobuf code is now in vendor/google; remove it here.
Daniel Martin (2):
Make ByteStrings serializable with java serialization.
Add tests for other ByteString subclasses
Dave Hawkey (2):
Don't reset cachedSize to 0 in getSerializedSize
Don't reset cachedSize to 0 in getSerializedSize
Dwayne Litzenberger (2):
Use 2to3 when building under Python 3.
Omit google-apputils dependency under Python 3
Fabrice de Gans-Riberi (1):
Change references to `vector` to use `std::vector`
Feng Xiao (59):
Merge changes from 2.6.1 release branch.
Update version number to 2.6.2-pre.
Add the missing solaris atomics header file.
Merge pull request #72 from Steelskin/master
Merge pull request #70 from AustinSchuh/master
Merge pull request #71 from abyss7/master
Merge pull request #50 from dlitz/compat-py3k
Adds more checks before deleting temporary files.
Down-integrate from internal code base.
Merge branch 'typofixes-vlajos-20141108' of https://github.com/vlajos/protobuf into typo
Merge pull request #69 from apaprocki/aix-atomicops
Update LICENSE to list files that aren't copyrighted by Google Inc.
Down-integrate from internal code base (C++ maps support).
Report a warning if the proto file doesn't have a syntax statement.
Merge pull request #84 from tseaver/fix_80-avoid_INT32_MAX_MIN
Merge pull request #86 from tseaver/compat_w_git_lt_1.8
Merge pull request #88 from tseaver/fix-class_key_must_be_declared_w_friend
Merge pull request #89 from tseaver/ignore-map_generated_files
Prepare nano proto code to be merged into protobuf repository.
Merge nano proto into protobuf repository.
Merge pull request #79 from xfxyjwf/license
Fix the broken link at the bottom of javanano/README.txt
Merge pull request #91 from xfxyjwf/android_nano
Add nano proto authors and update LICENSE file to include Android.mk.
Down-integrate from internal code base.
Merge pull request #103 from Ang3lus/master
Fix issue 99.
Fix Python C++ implementation build issues:
Fix javadoc warnings.
Merge pull request #106 from xfxyjwf/fix_62
Make Java TextFormat.printToUnicodeString() escape newlines.
Down-integrate from internal code base.
Replace links in nano proto code.
Merge pull request #110 from nsuke/tb-typo-cpp_extension
Merge pull request #109 from nsuke/tb-vim-oneof
Merge pull request #102 from fizbin/bytestring_serializable
Add a ./configure flag "DIST_LANG" to select which langauge to include
Get rid of some build warnings.
Merge pull request #81 from xfxyjwf/syntax_warning
Merge pull request #105 from xfxyjwf/fix_92
Merge pull request #111 from xfxyjwf/googlebot
Merge pull request #115 from xfxyjwf/fix_107
Merge pull request #116 from xfxyjwf/fix_warnings
Explicitly list all Java lite runtime tests (and exclude those depending
Update version number to v3.0.0-alpha-1
Update version number in descriptor.pb.h and plugin.pb.h. Protect death
Add a missing Java dist file.
Delete some globals in ShutdownProtobufLibrary().
Update post_process_dist.sh to produce a separate package for each
Replace is_enum with is_proto_enum because is_enum is not supported on some platforms.
Remove usage of features not supported in Java 1.6.
Fix thread local annotatoin and add back type traits is_convertable for MSVC
Update VC projects to include new source files.
Fix compile issues and test failures in VS2008.
Down-integrate from internal code base.
Fix the intermediate directory of vc project files.
Fix vsprojects/extract_includes.bat
Remove map_field.cc from lite-runtime.
Fix LIBPROTOBUF_PROTOBUF annotations for buliding protobuf as DLLs.
Ficus Kirkpatrick (3):
Don't use Arrays.copyOf in generated code.
Merge "Don't use Arrays.copyOf in generated code."
am e0ee97ea: Merge "Don\'t use Arrays.copyOf in generated code."
Iain Merrick (1):
Build the protocol buffer compiler 'protoc'.
Jan-Willem Maarse (10):
Fix NPE when clearing an extension in nano protos
Merge "Fix NPE when clearing an extension in nano protos"
am d20f0a42: Merge "Fix NPE when clearing an extension in nano protos"
am 58eb8e98: am d20f0a42: Merge "Fix NPE when clearing an extension in nano protos"
am 70eec2ca: am 58eb8e98: am d20f0a42: Merge "Fix NPE when clearing an extension in nano protos"
am 1fd235cb: am 70eec2ca: am 58eb8e98: am d20f0a42: Merge "Fix NPE when clearing an extension in nano protos"
am 399cf8d6: am 1fd235cb: am 70eec2ca: am 58eb8e98: am d20f0a42: Merge "Fix NPE when clearing an extension in nano protos"
am 67ebd315: am 399cf8d6: am 1fd235cb: am 70eec2ca: am 58eb8e98: am d20f0a42: Merge "Fix NPE when clearing an extension in nano protos"
am a3ab4364: am 67ebd315: am 399cf8d6: am 1fd235cb: am 70eec2ca: am 58eb8e98: am d20f0a42: Merge "Fix NPE when clearing an extension in nano protos"
am 1944e19c: am a3ab4364: am 67ebd315: am 399cf8d6: am 1fd235cb: am 70eec2ca: am 58eb8e98: am d20f0a42: Merge "Fix NPE when clearing an extension in nano protos"
Jason Neufeld (1):
Includes a MessageNano subclass's name's hashCode in hashCode calculations.
Jean-Baptiste Queru (6):
Merge commit 'remotes/korg/cupcake' into merge
Merge donut into master
Merge korg/donut into korg/master
reconcile korg/master into goog/master
Make these modules optional.
merge from gingerbread
Jeff Brown (1):
Remove the simulator target from all makefiles.
Jeff Davidson (12):
Support generation of Parcelable nano messages.
Merge "Support generation of Parcelable nano messages."
am 33a6680a: Merge "Support generation of Parcelable nano messages."
resolved conflicts for merge of 592b6078 to master
am 8113c186: resolved conflicts for merge of 592b6078 to master
am 7b4e8c78: am 8113c186: resolved conflicts for merge of 592b6078 to master
am cd8a72c7: am 7b4e8c78: am 8113c186: resolved conflicts for merge of 592b6078 to master
am 3656cc20: am cd8a72c7: am 7b4e8c78: am 8113c186: resolved conflicts for merge of 592b6078 to master
am 7bf58728: am 3656cc20: am cd8a72c7: am 7b4e8c78: am 8113c186: resolved conflicts for merge of 592b6078 to master
Move protobuf 2.3.0 to prebuilts.
Merge "Move protobuf 2.3.0 to prebuilts."
am 1ed1ec36: Merge "Move protobuf 2.3.0 to prebuilts."
Jie Dai (6):
Adds --ignore_service nano proto compiler flag
resolved conflicts for merge of 6965d891 to klp-modular-dev-plus-aosp
am c7a7b2ac: resolved conflicts for merge of 6965d891 to klp-modular-dev-plus-aosp
am 0ce2c261: am c7a7b2ac: resolved conflicts for merge of 6965d891 to klp-modular-dev-plus-aosp
am 1af058a5: am 0ce2c261: am c7a7b2ac: resolved conflicts for merge of 6965d891 to klp-modular-dev-plus-aosp
am 6f45464e: am 1af058a5: am 0ce2c261: am c7a7b2ac: resolved conflicts for merge of 6965d891 to klp-modular-dev-plus-aosp
Jisi Liu (3):
Link Java Nano generator into protoc.
Merge branch 'master' of github.com:google/protobuf
Merge pull request #104 from pherl/master
John Beard (1):
Add .gitignore file
Juan Silveira (2):
Keep pointers to extension values.
Add a hasExtension method to ExtendableMessageNano.
Kenny Root (1):
Skip stlport for simulator
Kristian Monsen (1):
Fix warnings warnings in header files, hide others.
Leandro Gracia Gil (3):
Fix the aprotoc target for Windows.
Merge "Fix the aprotoc target for Windows."
am 4d11e705: Merge "Fix the aprotoc target for Windows."
Linus Tufvesson (2):
Fixed octal printing of bytearrays
Fixed octal printing of bytearrays
Matt Thrailkill (1):
Fix typos in protobuf readme.
Max Cai (212):
Per-file java_multiple_files flag.
Fix outer classname for javamicro/javanano.
Add two codegen parameters to nano.
Add some bitfield helper methods from 2.4
Accessor style for optional fields.
Implement enum_style=java option.
Add missing README parts for enum_style and in-repo usage
Remove all field initializers and let ctor call clear().
Merge remote-tracking branch 'goog/klp-dev-plus-aosp' into tomerge
Merge "Remove all field initializers and let ctor call clear()."
am 39cee9f1: Merge "Remove all field initializers and let ctor call clear()."
am 145af9e8: am 39cee9f1: Merge "Remove all field initializers and let ctor call clear()."
am c85806ba: Merge remote-tracking branch \'goog/klp-dev-plus-aosp\' into tomerge
am 051ea13c: am c85806ba: Merge remote-tracking branch \'goog/klp-dev-plus-aosp\' into tomerge
Merge "Protect against null repeated fields."
am 63e819ad: Merge "Protect against null repeated fields."
am bf222b76: am 63e819ad: Merge "Protect against null repeated fields."
Fix repeated field merging semantics.
Merge "Fix repeated field merging semantics."
am afaf74ce: Merge "Fix repeated field merging semantics."
am 5b4b84a1: am afaf74ce: Merge "Fix repeated field merging semantics."
Make generated code more aligned with Google Java style.
Merge "Make generated code more aligned with Google Java style."
am c50f605c: Merge "Make generated code more aligned with Google Java style."
am d52f7a3e: am c50f605c: Merge "Make generated code more aligned with Google Java style."
Feature request: set() and clear() accessors return this
Merge "Feature request: set() and clear() accessors return this"
am 42be1e79: Merge "Feature request: set() and clear() accessors return this"
am 7cb6b37f: am 42be1e79: Merge "Feature request: set() and clear() accessors return this"
Merge "Implement hashCode() and equals() behind a generator option."
am bb971d53: Merge "Implement hashCode() and equals() behind a generator option."
am 72fa49d4: am bb971d53: Merge "Implement hashCode() and equals() behind a generator option."
Merge "Allow for ref-type arrays containing null elements."
am 8a15121c: Merge "Allow for ref-type arrays containing null elements."
am 42b5c369: am 8a15121c: Merge "Allow for ref-type arrays containing null elements."
Merge "Minimize method count for nanoproto."
am ac8e2e15: Merge "Minimize method count for nanoproto."
am 77e9fbd3: am ac8e2e15: Merge "Minimize method count for nanoproto."
Merge "Fix warnings warnings in header files, hide others."
am 332076f0: Merge "Fix warnings warnings in header files, hide others."
am 382a066a: am 332076f0: Merge "Fix warnings warnings in header files, hide others."
Merge "Update MessageNano#toString() to return mostly valid TextFormat."
am 3e0d99fa: Merge "Update MessageNano#toString() to return mostly valid TextFormat."
am 0afd5a4d: am 3e0d99fa: Merge "Update MessageNano#toString() to return mostly valid TextFormat."
Align with main: two ways of parsing repeated packable fields.
Merge "Align with main: two ways of parsing repeated packable fields."
am f5271c9c: Merge "Align with main: two ways of parsing repeated packable fields."
am 0143d32d: am f5271c9c: Merge "Align with main: two ways of parsing repeated packable fields."
Merge "Nano: don't generate accessor methods for nested methods"
am cea499ac: Merge "Nano: don\'t generate accessor methods for nested methods"
am 6a6b3b38: am cea499ac: Merge "Nano: don\'t generate accessor methods for nested methods"
Avoid class initializers to help ProGuard.
Merge "Avoid class initializers to help ProGuard."
am 3f9bd998: Merge "Avoid class initializers to help ProGuard."
am 6b9d96b2: am 3f9bd998: Merge "Avoid class initializers to help ProGuard."
Extension overhaul.
Don't serialize required fields whose 'has' flags are unset.
Correctness: floating point equality using bits instead of ==.
Merge "Don't serialize required fields whose 'has' flags are unset."
Merge "Correctness: floating point equality using bits instead of ==."
am d6aeae14: Merge "Don\'t serialize required fields whose \'has\' flags are unset."
am 4b5874fa: Merge "Correctness: floating point equality using bits instead of ==."
am 538abc5b: am d6aeae14: Merge "Don\'t serialize required fields whose \'has\' flags are unset."
am 1be96c57: am 4b5874fa: Merge "Correctness: floating point equality using bits instead of ==."
Allow whitespace in nano codegen options.
Merge "Allow whitespace in nano codegen options."
am a8af729b: Merge "Allow whitespace in nano codegen options."
am d5219df3: am a8af729b: Merge "Allow whitespace in nano codegen options."
Add validation when parsing enum fields.
Fix repeated packed field merging code for non-packed data.
Merge changes I9fecff3c,I2c1eb07f
am 447f664a: Merge changes I9fecff3c,I2c1eb07f
am 5d33d23d: am 447f664a: Merge changes I9fecff3c,I2c1eb07f
Merge "Extension overhaul."
am afc1553a: Merge "Extension overhaul."
am 214997ce: am afc1553a: Merge "Extension overhaul."
am 447f664a: Merge changes I9fecff3c,I2c1eb07f
am afc1553a: Merge "Extension overhaul."
Merge "Don't reset cachedSize to 0 in getSerializedSize"
am ea68d73c: Merge "Don\'t reset cachedSize to 0 in getSerializedSize"
am 0391f00b: am ea68d73c: Merge "Don\'t reset cachedSize to 0 in getSerializedSize"
Merge "Adds --ignore_service nano proto compiler flag"
am 829f6c01: Merge "Adds --ignore_service nano proto compiler flag"
am 43365182: am 829f6c01: Merge "Adds --ignore_service nano proto compiler flag"
am ee8847c1: am 145af9e8: am 39cee9f1: Merge "Remove all field initializers and let ctor call clear()."
am 0e5add1d: am 051ea13c: am c85806ba: Merge remote-tracking branch \'goog/klp-dev-plus-aosp\' into tomerge
am 8f903e12: am bf222b76: am 63e819ad: Merge "Protect against null repeated fields."
am 677d51bb: am 5b4b84a1: am afaf74ce: Merge "Fix repeated field merging semantics."
am 4b359335: am d52f7a3e: am c50f605c: Merge "Make generated code more aligned with Google Java style."
am 0610e683: am 7cb6b37f: am 42be1e79: Merge "Feature request: set() and clear() accessors return this"
am e2cbcf38: am 72fa49d4: am bb971d53: Merge "Implement hashCode() and equals() behind a generator option."
am 8eda9d3f: am 42b5c369: am 8a15121c: Merge "Allow for ref-type arrays containing null elements."
am b88c1729: am 77e9fbd3: am ac8e2e15: Merge "Minimize method count for nanoproto."
am 139bd6ac: am 382a066a: am 332076f0: Merge "Fix warnings warnings in header files, hide others."
am 4115d56f: am 0afd5a4d: am 3e0d99fa: Merge "Update MessageNano#toString() to return mostly valid TextFormat."
am b3ad7eae: am 0143d32d: am f5271c9c: Merge "Align with main: two ways of parsing repeated packable fields."
am 7c0eadd4: am 6a6b3b38: am cea499ac: Merge "Nano: don\'t generate accessor methods for nested methods"
am 55c3d6d9: am 6b9d96b2: am 3f9bd998: Merge "Avoid class initializers to help ProGuard."
am a5273888: am 538abc5b: am d6aeae14: Merge "Don\'t serialize required fields whose \'has\' flags are unset."
am 6adb3df8: am 1be96c57: am 4b5874fa: Merge "Correctness: floating point equality using bits instead of ==."
am 6a1f70ab: am d5219df3: am a8af729b: Merge "Allow whitespace in nano codegen options."
am f593c0a5: am ee8847c1: am 145af9e8: am 39cee9f1: Merge "Remove all field initializers and let ctor call clear()."
am caf35105: am 0e5add1d: am 051ea13c: am c85806ba: Merge remote-tracking branch \'goog/klp-dev-plus-aosp\' into tomerge
am e4bf716d: am 8f903e12: am bf222b76: am 63e819ad: Merge "Protect against null repeated fields."
am f97b9ced: am 677d51bb: am 5b4b84a1: am afaf74ce: Merge "Fix repeated field merging semantics."
am 6988e26b: am 4b359335: am d52f7a3e: am c50f605c: Merge "Make generated code more aligned with Google Java style."
am fc9db907: am 0610e683: am 7cb6b37f: am 42be1e79: Merge "Feature request: set() and clear() accessors return this"
am 92d0bd25: am e2cbcf38: am 72fa49d4: am bb971d53: Merge "Implement hashCode() and equals() behind a generator option."
am d734d52f: am 8eda9d3f: am 42b5c369: am 8a15121c: Merge "Allow for ref-type arrays containing null elements."
am 4ba333e8: am b88c1729: am 77e9fbd3: am ac8e2e15: Merge "Minimize method count for nanoproto."
am 5e0c3d21: am 139bd6ac: am 382a066a: am 332076f0: Merge "Fix warnings warnings in header files, hide others."
am f2d09988: am 4115d56f: am 0afd5a4d: am 3e0d99fa: Merge "Update MessageNano#toString() to return mostly valid TextFormat."
am 5645677f: am b3ad7eae: am 0143d32d: am f5271c9c: Merge "Align with main: two ways of parsing repeated packable fields."
am aa721735: am 7c0eadd4: am 6a6b3b38: am cea499ac: Merge "Nano: don\'t generate accessor methods for nested methods"
am 649efad8: am 55c3d6d9: am 6b9d96b2: am 3f9bd998: Merge "Avoid class initializers to help ProGuard."
am 0ea68954: am a5273888: am 538abc5b: am d6aeae14: Merge "Don\'t serialize required fields whose \'has\' flags are unset."
am 2c210bb9: am 6adb3df8: am 1be96c57: am 4b5874fa: Merge "Correctness: floating point equality using bits instead of ==."
am fa7bf363: am 6a1f70ab: am d5219df3: am a8af729b: Merge "Allow whitespace in nano codegen options."
am 5c3544dd: am 5d33d23d: am 447f664a: Merge changes I9fecff3c,I2c1eb07f
am 9141054b: am 214997ce: am afc1553a: Merge "Extension overhaul."
am 286f5705: am 5c3544dd: am 5d33d23d: am 447f664a: Merge changes I9fecff3c,I2c1eb07f
am e8f7a71c: am 9141054b: am 214997ce: am afc1553a: Merge "Extension overhaul."
am dd38a37e: am 0391f00b: am ea68d73c: Merge "Don\'t reset cachedSize to 0 in getSerializedSize"
am 99c98018: am 43365182: am 829f6c01: Merge "Adds --ignore_service nano proto compiler flag"
am 888cafe4: am dd38a37e: am 0391f00b: am ea68d73c: Merge "Don\'t reset cachedSize to 0 in getSerializedSize"
am e69eaa22: am 99c98018: am 43365182: am 829f6c01: Merge "Adds --ignore_service nano proto compiler flag"
Fix how getRepeatedFieldArrayLength works
Fix access around unknownFieldData.
Merge "Fix access around unknownFieldData."
Merge "Keep pointers to extension values."
am daf63839: Merge "Keep pointers to extension values."
am a88808d4: Merge "Fix access around unknownFieldData."
Merge "Add a hasExtension method to ExtendableMessageNano."
am 11607eb1: Merge "Add a hasExtension method to ExtendableMessageNano."
Merge "Fix how getRepeatedFieldArrayLength works"
am a76831c3: Merge "Fix how getRepeatedFieldArrayLength works"
am 6ed6b682: am f593c0a5: am ee8847c1: am 145af9e8: am 39cee9f1: Merge "Remove all field initializers and let ctor call clear()."
am aa2afb08: am caf35105: am 0e5add1d: am 051ea13c: am c85806ba: Merge remote-tracking branch \'goog/klp-dev-plus-aosp\' into tomerge
am ab8cc071: am e4bf716d: am 8f903e12: am bf222b76: am 63e819ad: Merge "Protect against null repeated fields."
am b2a7fc6b: am f97b9ced: am 677d51bb: am 5b4b84a1: am afaf74ce: Merge "Fix repeated field merging semantics."
am c45fb6a2: am 6988e26b: am 4b359335: am d52f7a3e: am c50f605c: Merge "Make generated code more aligned with Google Java style."
am a84e8aa6: am fc9db907: am 0610e683: am 7cb6b37f: am 42be1e79: Merge "Feature request: set() and clear() accessors return this"
am 2693b3aa: am 92d0bd25: am e2cbcf38: am 72fa49d4: am bb971d53: Merge "Implement hashCode() and equals() behind a generator option."
am be303d03: am d734d52f: am 8eda9d3f: am 42b5c369: am 8a15121c: Merge "Allow for ref-type arrays containing null elements."
am fdf5bde4: am 4ba333e8: am b88c1729: am 77e9fbd3: am ac8e2e15: Merge "Minimize method count for nanoproto."
am 4d28b813: am 5e0c3d21: am 139bd6ac: am 382a066a: am 332076f0: Merge "Fix warnings warnings in header files, hide others."
am 7630b478: am f2d09988: am 4115d56f: am 0afd5a4d: am 3e0d99fa: Merge "Update MessageNano#toString() to return mostly valid TextFormat."
am fafcc5b4: am 5645677f: am b3ad7eae: am 0143d32d: am f5271c9c: Merge "Align with main: two ways of parsing repeated packable fields."
am 175d44db: am aa721735: am 7c0eadd4: am 6a6b3b38: am cea499ac: Merge "Nano: don\'t generate accessor methods for nested methods"
am 843619f3: am 649efad8: am 55c3d6d9: am 6b9d96b2: am 3f9bd998: Merge "Avoid class initializers to help ProGuard."
am e41d4c04: am 0ea68954: am a5273888: am 538abc5b: am d6aeae14: Merge "Don\'t serialize required fields whose \'has\' flags are unset."
am 06396abf: am 2c210bb9: am 6adb3df8: am 1be96c57: am 4b5874fa: Merge "Correctness: floating point equality using bits instead of ==."
am 0c063c66: am fa7bf363: am 6a1f70ab: am d5219df3: am a8af729b: Merge "Allow whitespace in nano codegen options."
am 0eaea6a8: am 286f5705: am 5c3544dd: am 5d33d23d: am 447f664a: Merge changes I9fecff3c,I2c1eb07f
am 9de52973: am e8f7a71c: am 9141054b: am 214997ce: am afc1553a: Merge "Extension overhaul."
am e9056405: am 6ed6b682: am f593c0a5: am ee8847c1: am 145af9e8: am 39cee9f1: Merge "Remove all field initializers and let ctor call clear()."
am 4734b989: am aa2afb08: am caf35105: am 0e5add1d: am 051ea13c: am c85806ba: Merge remote-tracking branch \'goog/klp-dev-plus-aosp\' into tomerge
am bd188bc7: am ab8cc071: am e4bf716d: am 8f903e12: am bf222b76: am 63e819ad: Merge "Protect against null repeated fields."
am 2cb17b18: am b2a7fc6b: am f97b9ced: am 677d51bb: am 5b4b84a1: am afaf74ce: Merge "Fix repeated field merging semantics."
am 80fe1808: am c45fb6a2: am 6988e26b: am 4b359335: am d52f7a3e: am c50f605c: Merge "Make generated code more aligned with Google Java style."
am 74b536a5: am a84e8aa6: am fc9db907: am 0610e683: am 7cb6b37f: am 42be1e79: Merge "Feature request: set() and clear() accessors return this"
am e668f0c3: am 2693b3aa: am 92d0bd25: am e2cbcf38: am 72fa49d4: am bb971d53: Merge "Implement hashCode() and equals() behind a generator option."
am f1c5cd09: am be303d03: am d734d52f: am 8eda9d3f: am 42b5c369: am 8a15121c: Merge "Allow for ref-type arrays containing null elements."
am dce52afd: am fdf5bde4: am 4ba333e8: am b88c1729: am 77e9fbd3: am ac8e2e15: Merge "Minimize method count for nanoproto."
am 8948d605: am 4d28b813: am 5e0c3d21: am 139bd6ac: am 382a066a: am 332076f0: Merge "Fix warnings warnings in header files, hide others."
am 6ca2db13: am 7630b478: am f2d09988: am 4115d56f: am 0afd5a4d: am 3e0d99fa: Merge "Update MessageNano#toString() to return mostly valid TextFormat."
am c0bffb62: am fafcc5b4: am 5645677f: am b3ad7eae: am 0143d32d: am f5271c9c: Merge "Align with main: two ways of parsing repeated packable fields."
am 01d1cdeb: am 175d44db: am aa721735: am 7c0eadd4: am 6a6b3b38: am cea499ac: Merge "Nano: don\'t generate accessor methods for nested methods"
am a6ee3baf: am 843619f3: am 649efad8: am 55c3d6d9: am 6b9d96b2: am 3f9bd998: Merge "Avoid class initializers to help ProGuard."
am b22123d1: am e41d4c04: am 0ea68954: am a5273888: am 538abc5b: am d6aeae14: Merge "Don\'t serialize required fields whose \'has\' flags are unset."
am d043ff9d: am 06396abf: am 2c210bb9: am 6adb3df8: am 1be96c57: am 4b5874fa: Merge "Correctness: floating point equality using bits instead of ==."
am 5843426a: am 0c063c66: am fa7bf363: am 6a1f70ab: am d5219df3: am a8af729b: Merge "Allow whitespace in nano codegen options."
am 1b9cb7b2: am 0eaea6a8: am 286f5705: am 5c3544dd: am 5d33d23d: am 447f664a: Merge changes I9fecff3c,I2c1eb07f
am 67584f49: am 9de52973: am e8f7a71c: am 9141054b: am 214997ce: am afc1553a: Merge "Extension overhaul."
am a61b2ef1: am e9056405: am 6ed6b682: am f593c0a5: am ee8847c1: am 145af9e8: am 39cee9f1: Merge "Remove all field initializers and let ctor call clear()."
am eaac3e7b: am 4734b989: am aa2afb08: am caf35105: am 0e5add1d: am 051ea13c: am c85806ba: Merge remote-tracking branch \'goog/klp-dev-plus-aosp\' into tomerge
am fa0eb541: am bd188bc7: am ab8cc071: am e4bf716d: am 8f903e12: am bf222b76: am 63e819ad: Merge "Protect against null repeated fields."
am 03016e74: am 2cb17b18: am b2a7fc6b: am f97b9ced: am 677d51bb: am 5b4b84a1: am afaf74ce: Merge "Fix repeated field merging semantics."
am 3c4cfdab: am 80fe1808: am c45fb6a2: am 6988e26b: am 4b359335: am d52f7a3e: am c50f605c: Merge "Make generated code more aligned with Google Java style."
am 826b4cf5: am 74b536a5: am a84e8aa6: am fc9db907: am 0610e683: am 7cb6b37f: am 42be1e79: Merge "Feature request: set() and clear() accessors return this"
am 17395e55: am e668f0c3: am 2693b3aa: am 92d0bd25: am e2cbcf38: am 72fa49d4: am bb971d53: Merge "Implement hashCode() and equals() behind a generator option."
am 438ca4a8: am f1c5cd09: am be303d03: am d734d52f: am 8eda9d3f: am 42b5c369: am 8a15121c: Merge "Allow for ref-type arrays containing null elements."
am 4b700b8a: am dce52afd: am fdf5bde4: am 4ba333e8: am b88c1729: am 77e9fbd3: am ac8e2e15: Merge "Minimize method count for nanoproto."
am 2267616c: am 8948d605: am 4d28b813: am 5e0c3d21: am 139bd6ac: am 382a066a: am 332076f0: Merge "Fix warnings warnings in header files, hide others."
am 9b078384: am 6ca2db13: am 7630b478: am f2d09988: am 4115d56f: am 0afd5a4d: am 3e0d99fa: Merge "Update MessageNano#toString() to return mostly valid TextFormat."
am a59cc53b: am c0bffb62: am fafcc5b4: am 5645677f: am b3ad7eae: am 0143d32d: am f5271c9c: Merge "Align with main: two ways of parsing repeated packable fields."
am 3a324516: am 01d1cdeb: am 175d44db: am aa721735: am 7c0eadd4: am 6a6b3b38: am cea499ac: Merge "Nano: don\'t generate accessor methods for nested methods"
am dad271e9: am a6ee3baf: am 843619f3: am 649efad8: am 55c3d6d9: am 6b9d96b2: am 3f9bd998: Merge "Avoid class initializers to help ProGuard."
am ddf77b19: am b22123d1: am e41d4c04: am 0ea68954: am a5273888: am 538abc5b: am d6aeae14: Merge "Don\'t serialize required fields whose \'has\' flags are unset."
am c1d044c0: am d043ff9d: am 06396abf: am 2c210bb9: am 6adb3df8: am 1be96c57: am 4b5874fa: Merge "Correctness: floating point equality using bits instead of ==."
am cb395443: am 5843426a: am 0c063c66: am fa7bf363: am 6a1f70ab: am d5219df3: am a8af729b: Merge "Allow whitespace in nano codegen options."
am 34559f88: am 1b9cb7b2: am 0eaea6a8: am 286f5705: am 5c3544dd: am 5d33d23d: am 447f664a: Merge changes I9fecff3c,I2c1eb07f
am 339f5a6d: am 67584f49: am 9de52973: am e8f7a71c: am 9141054b: am 214997ce: am afc1553a: Merge "Extension overhaul."
am 90048528: am 888cafe4: am dd38a37e: am 0391f00b: am ea68d73c: Merge "Don\'t reset cachedSize to 0 in getSerializedSize"
am 3af26f43: am e69eaa22: am 99c98018: am 43365182: am 829f6c01: Merge "Adds --ignore_service nano proto compiler flag"
am f39998c2: am daf63839: Merge "Keep pointers to extension values."
am 55ef21bc: am a88808d4: Merge "Fix access around unknownFieldData."
am 61317c32: am 90048528: am 888cafe4: am dd38a37e: am 0391f00b: am ea68d73c: Merge "Don\'t reset cachedSize to 0 in getSerializedSize"
am f613f9e7: am 3af26f43: am e69eaa22: am 99c98018: am 43365182: am 829f6c01: Merge "Adds --ignore_service nano proto compiler flag"
am 2e6d4ae0: am f39998c2: am daf63839: Merge "Keep pointers to extension values."
am ecb2c88b: am 55ef21bc: am a88808d4: Merge "Fix access around unknownFieldData."
am 2b469993: am 61317c32: am 90048528: am 888cafe4: am dd38a37e: am 0391f00b: am ea68d73c: Merge "Don\'t reset cachedSize to 0 in getSerializedSize"
am ee16014e: am f613f9e7: am 3af26f43: am e69eaa22: am 99c98018: am 43365182: am 829f6c01: Merge "Adds --ignore_service nano proto compiler flag"
am b172d667: am 2e6d4ae0: am f39998c2: am daf63839: Merge "Keep pointers to extension values."
am c6d612ac: am ecb2c88b: am 55ef21bc: am a88808d4: Merge "Fix access around unknownFieldData."
Merge "Fixed octal printing of bytearrays"
Revert "Fixed octal printing of bytearrays"
Merge "Revert "Fixed octal printing of bytearrays""
am 238e0ac5: Merge "Fixed octal printing of bytearrays"
am 77866143: Merge "Revert "Fixed octal printing of bytearrays""
Merge "Fixed octal printing of bytearrays"
am 0068978c: Merge "Fixed octal printing of bytearrays"
Mitsuru Oshima (4):
ProtoBuf update
am 9aaf5076: ProtoBuf update * Added IntMap that uses Hashtable for larger keys * Chagned to use IntMap to allow larger tags * Changed to use autoboxing for int/longs.
Revert "ProtoBuf update"
am 7fea449b: Revert "ProtoBuf update"
Nicholas Seckar (2):
Fix roundtrip failure with groups when unknown fields are enabled.
Update MessageNano#toString() to return mostly valid TextFormat.
Nobuaki Sukegawa (2):
Add oneof keyword to proto.vim
Fix typo
Omari Stephens (1):
Make protobuf usable by host-side java apps
Przemyslaw Szczepaniak (1):
Add gnustl+rtti version of cpp full library
Qiwen Zhao (1):
reset with history at sha1 d5219df3ce036d4f43262bbda1016097a59a0c81
Robert Edmonds (1):
Imported Upstream version 3.0.0~alpha-1
Sam Hasinoff (2):
Fix build, by using external/zlib instead of system zlib
am f91b7fa1: Fix build, by using external/zlib instead of system zlib
The Android Open Source Project (29):
Initial Contribution
auto import from //branches/cupcake/... at 130745
auto import from //branches/cupcake/... at 132276
auto import from //depot/cupcake/@137055
auto import from //depot/cupcake/@132589
auto import from //depot/cupcake/@135843
auto import from //depot/cupcake/@135843
auto import from //branches/cupcake_rel/... at 140373
Merge commit 'korg/cupcake'
Merge branch 'open_source_no_contributions' into google_internal
reconcile android-2.1_r1 snapshot
reconcile main tree with open-source eclair
am 96ccdc22: reconcile main tree with open-source eclair
Merge commit '7cb6b37f3799affce9e1be39977d4419283df795' into HEAD
am c4c4a562: Merge commit \'7cb6b37f3799affce9e1be39977d4419283df795\' into HEAD
am 485b7645: am c4c4a562: Merge commit \'7cb6b37f3799affce9e1be39977d4419283df795\' into HEAD
Merge commit '0afd5a4d782037ea641d75d595cf5d38ed6978ac' into HEAD
am b6089cca: Merge commit \'0afd5a4d782037ea641d75d595cf5d38ed6978ac\' into HEAD
am 98c9208a: am b6089cca: Merge commit \'0afd5a4d782037ea641d75d595cf5d38ed6978ac\' into HEAD
am 6597e4f2: am 485b7645: am c4c4a562: Merge commit \'7cb6b37f3799affce9e1be39977d4419283df795\' into HEAD
am da929e3e: am 98c9208a: am b6089cca: Merge commit \'0afd5a4d782037ea641d75d595cf5d38ed6978ac\' into HEAD
am dee682fd: am 6597e4f2: am 485b7645: am c4c4a562: Merge commit \'7cb6b37f3799affce9e1be39977d4419283df795\' into HEAD
am 2f879713: am da929e3e: am 98c9208a: am b6089cca: Merge commit \'0afd5a4d782037ea641d75d595cf5d38ed6978ac\' into HEAD
am 6a76a968: am dee682fd: am 6597e4f2: am 485b7645: am c4c4a562: Merge commit \'7cb6b37f3799affce9e1be39977d4419283df795\' into HEAD
am bfa5ee2f: am 2f879713: am da929e3e: am 98c9208a: am b6089cca: Merge commit \'0afd5a4d782037ea641d75d595cf5d38ed6978ac\' into HEAD
am e747813b: am 6a76a968: am dee682fd: am 6597e4f2: am 485b7645: am c4c4a562: Merge commit \'7cb6b37f3799affce9e1be39977d4419283df795\' into HEAD
am 23b66756: am bfa5ee2f: am 2f879713: am da929e3e: am 98c9208a: am b6089cca: Merge commit \'0afd5a4d782037ea641d75d595cf5d38ed6978ac\' into HEAD
am 6d879b4e: am e747813b: am 6a76a968: am dee682fd: am 6597e4f2: am 485b7645: am c4c4a562: Merge commit \'7cb6b37f3799affce9e1be39977d4419283df795\' into HEAD
am 8d5b7fb2: am 23b66756: am bfa5ee2f: am 2f879713: am da929e3e: am 98c9208a: am b6089cca: Merge commit \'0afd5a4d782037ea641d75d595cf5d38ed6978ac\' into HEAD
Tom Chao (2):
Update nano to serialize java keywords properly.
Minimize method count for nanoproto.
Tres Seaver (10):
Compat w/ git < 1.8.
Ignore generated test scaffolding files.
Don't rely on non-standard 'INT32_MAX' / 'INT32_MIN'.
Exclude Python build artifacts.
Use 'kint32min'/'kint32max' constants, rather than defining locally.
Avoid '**/' patterns for compat w/ git < 1.8.
Merge remote-tracking branch 'upstream/master'
Fix 'error: a class-key must be used when declaring a friend' compile error.
Fix testcase compile failure under gcc 4.6:
Ignore files generated from new 'map*.protobuf' sources.
Ulas Kirazci (88):
Nano protobufs.
Nano protobufs.
am 43325653: Nano protobufs.
Prevent conflicts between local and proto variable names.
Prevent conflicts between local and proto variable names.
am fb8f78fe: Prevent conflicts between local and proto variable names.
am eda87c5c: Merge "Fix vanilla make build."
Merge "Make it possible to use MessageNano.mergeFrom without casting."
am 8cf17a8f: Merge "Make it possible to use MessageNano.mergeFrom without casting."
am 7bb086c8: am eda87c5c: Merge "Fix vanilla make build."
am 67b43035: am 8cf17a8f: Merge "Make it possible to use MessageNano.mergeFrom without casting."
Merge "Update nano to serialize java keywords properly."
am aad4b307: Merge "Update nano to serialize java keywords properly."
Add contribution instructions for nano.
am 4c18ce2d: am aad4b307: Merge "Update nano to serialize java keywords properly."
Merge "Add contribution instructions for nano."
am a400007e: Merge "Add contribution instructions for nano."
am f604f71a: am a400007e: Merge "Add contribution instructions for nano."
Merge "Allow NaN/+inf/-inf defaults in micro/nano."
am 19c4090e: Merge "Allow NaN/+inf/-inf defaults in micro/nano."
am 3099f911: am 19c4090e: Merge "Allow NaN/+inf/-inf defaults in micro/nano."
Add test for passing in proto params.
Merge "Per-file java_multiple_files flag."
am ac5a239e: Merge "Per-file java_multiple_files flag."
Merge "Add test for passing in proto params."
am 021f8f1b: Merge "Add test for passing in proto params."
Add an option to inspect "has" state upon parse.
Merge "Add an option to inspect "has" state upon parse."
am be47f55e: Merge "Add an option to inspect "has" state upon parse."
Fixed packed repeated serialization.
Merge "Fixed packed repeated serialization."
am 87c8e31b: Merge "Fixed packed repeated serialization."
Merge "Add two codegen parameters to nano."
am 9e6afdf9: Merge "Add two codegen parameters to nano."
am 081ac0fc: am 9e6afdf9: Merge "Add two codegen parameters to nano."
Merge "Add some bitfield helper methods from 2.4"
am cc652daa: Merge "Add some bitfield helper methods from 2.4"
am 2923f3d2: am cc652daa: Merge "Add some bitfield helper methods from 2.4"
Merge "Accessor style for optional fields."
Merge "Implement enum_style=java option."
am 0d035e9b: Merge "Accessor style for optional fields."
am 44dc2f1e: Merge "Implement enum_style=java option."
am 3f85c840: am 0d035e9b: Merge "Accessor style for optional fields."
am 8f93f123: am 44dc2f1e: Merge "Implement enum_style=java option."
Merge "Fix roundtrip failure with groups when unknown fields are enabled."
am 9827c718: Merge "Fix roundtrip failure with groups when unknown fields are enabled."
am 0255eb04: am 9827c718: Merge "Fix roundtrip failure with groups when unknown fields are enabled."
Merge "Add reftypes field generator option."
am c4a1b547: Merge "Add reftypes field generator option."
am 570db0e9: am c4a1b547: Merge "Add reftypes field generator option."
Merge "Add missing README parts for enum_style and in-repo usage"
am cbb08132: Merge "Add missing README parts for enum_style and in-repo usage"
am 7457ebc9: am cbb08132: Merge "Add missing README parts for enum_style and in-repo usage"
am bbda8b10: am 081ac0fc: am 9e6afdf9: Merge "Add two codegen parameters to nano."
am 6778e0a0: am 2923f3d2: am cc652daa: Merge "Add some bitfield helper methods from 2.4"
am c017bb8c: am 3f85c840: am 0d035e9b: Merge "Accessor style for optional fields."
am c1f9ebce: am 8f93f123: am 44dc2f1e: Merge "Implement enum_style=java option."
am 5f8ef515: am 0255eb04: am 9827c718: Merge "Fix roundtrip failure with groups when unknown fields are enabled."
am ca07ad9d: am 570db0e9: am c4a1b547: Merge "Add reftypes field generator option."
am dc8f4a8b: am 7457ebc9: am cbb08132: Merge "Add missing README parts for enum_style and in-repo usage"
am 8c131d5b: am bbda8b10: am 081ac0fc: am 9e6afdf9: Merge "Add two codegen parameters to nano."
am 194529f1: am 6778e0a0: am 2923f3d2: am cc652daa: Merge "Add some bitfield helper methods from 2.4"
am a5df3261: am c017bb8c: am 3f85c840: am 0d035e9b: Merge "Accessor style for optional fields."
am 2b9bfa3d: am c1f9ebce: am 8f93f123: am 44dc2f1e: Merge "Implement enum_style=java option."
am e9a0bb71: am 5f8ef515: am 0255eb04: am 9827c718: Merge "Fix roundtrip failure with groups when unknown fields are enabled."
am 90e065dd: am ca07ad9d: am 570db0e9: am c4a1b547: Merge "Add reftypes field generator option."
am 4dfa34e2: am dc8f4a8b: am 7457ebc9: am cbb08132: Merge "Add missing README parts for enum_style and in-repo usage"
am ede9a1f5: am 8c131d5b: am bbda8b10: am 081ac0fc: am 9e6afdf9: Merge "Add two codegen parameters to nano."
am 998ea484: am 194529f1: am 6778e0a0: am 2923f3d2: am cc652daa: Merge "Add some bitfield helper methods from 2.4"
am 6d1e9709: am a5df3261: am c017bb8c: am 3f85c840: am 0d035e9b: Merge "Accessor style for optional fields."
am a8b4f97f: am 2b9bfa3d: am c1f9ebce: am 8f93f123: am 44dc2f1e: Merge "Implement enum_style=java option."
am a6ddccbb: am e9a0bb71: am 5f8ef515: am 0255eb04: am 9827c718: Merge "Fix roundtrip failure with groups when unknown fields are enabled."
am ea95349d: am 90e065dd: am ca07ad9d: am 570db0e9: am c4a1b547: Merge "Add reftypes field generator option."
am f7bbfdfd: am 4dfa34e2: am dc8f4a8b: am 7457ebc9: am cbb08132: Merge "Add missing README parts for enum_style and in-repo usage"
am 5a9d43b2: am ede9a1f5: am 8c131d5b: am bbda8b10: am 081ac0fc: am 9e6afdf9: Merge "Add two codegen parameters to nano."
am e6780389: am 998ea484: am 194529f1: am 6778e0a0: am 2923f3d2: am cc652daa: Merge "Add some bitfield helper methods from 2.4"
am a19dbf97: am 6d1e9709: am a5df3261: am c017bb8c: am 3f85c840: am 0d035e9b: Merge "Accessor style for optional fields."
am 2b2d73d2: am a8b4f97f: am 2b9bfa3d: am c1f9ebce: am 8f93f123: am 44dc2f1e: Merge "Implement enum_style=java option."
am b42d5107: am a6ddccbb: am e9a0bb71: am 5f8ef515: am 0255eb04: am 9827c718: Merge "Fix roundtrip failure with groups when unknown fields are enabled."
am 8d2f4cf7: am ea95349d: am 90e065dd: am ca07ad9d: am 570db0e9: am c4a1b547: Merge "Add reftypes field generator option."
am e655a862: am f7bbfdfd: am 4dfa34e2: am dc8f4a8b: am 7457ebc9: am cbb08132: Merge "Add missing README parts for enum_style and in-repo usage"
am 242aa182: am 5a9d43b2: am ede9a1f5: am 8c131d5b: am bbda8b10: am 081ac0fc: am 9e6afdf9: Merge "Add two codegen parameters to nano."
am 54ad71fb: am e6780389: am 998ea484: am 194529f1: am 6778e0a0: am 2923f3d2: am cc652daa: Merge "Add some bitfield helper methods from 2.4"
am dde8a694: am a19dbf97: am 6d1e9709: am a5df3261: am c017bb8c: am 3f85c840: am 0d035e9b: Merge "Accessor style for optional fields."
am 8877603f: am 2b2d73d2: am a8b4f97f: am 2b9bfa3d: am c1f9ebce: am 8f93f123: am 44dc2f1e: Merge "Implement enum_style=java option."
am d8fbc188: am b42d5107: am a6ddccbb: am e9a0bb71: am 5f8ef515: am 0255eb04: am 9827c718: Merge "Fix roundtrip failure with groups when unknown fields are enabled."
am 73789372: am 8d2f4cf7: am ea95349d: am 90e065dd: am ca07ad9d: am 570db0e9: am c4a1b547: Merge "Add reftypes field generator option."
am 056670c9: am e655a862: am f7bbfdfd: am 4dfa34e2: am dc8f4a8b: am 7457ebc9: am cbb08132: Merge "Add missing README parts for enum_style and in-repo usage"
Veres Lajos (1):
typo fixes - https://github.com/vlajos/misspell_fixer
Wink Saville (117):
The Android specific files prior to adding protobuf 2.2.0a sources.
Add protobuf 2.2.0a sources
Add support for Java micro protobuf's to protobuf-2.2.0a.
Add protobuf 2.3.0 sources
Add support for Java micro protobuf's to protobuf-2.3.0.
Add libprotobuf-cpp-2.3.0-lite
Merge "Add libprotobuf-cpp-2.3.0-lite"
Add libprotobuf-java-2.3.0-lite.
Changed speed optimization for strings.
Add libprotobuf-cpp-2.3.0-full.
Remove vestigial references to StringUtf8Micro.
am 3574de1c: Remove vestigial references to StringUtf8Micro.
Rename protoc to aprotoc.
Merge "Nano protobufs."
am 216c9e86: Merge "Nano protobufs."
Merge "Prevent conflicts between local and proto variable names."
am a6b79eb9: Merge "Prevent conflicts between local and proto variable names."
Merge "Fix typos in protobuf readme."
am d29f87c7: Merge "Fix typos in protobuf readme."
Merge "Fix javanano compiler generating uncompileable java code. This happened for enums when java_multiple_files=true."
am 4e76e72b: Merge "Fix javanano compiler generating uncompileable java code. This happened for enums when java_multiple_files=true."
Merge "Add toString() method to MessageNano."
am 6f59b383: Merge "Add toString() method to MessageNano."
Merge "Fix enum field references with java_multiple_files."
am 9459b5c4: Merge "Fix enum field references with java_multiple_files."
Merge "Nano support for extensions and unknown fields."
am 0a1429cc: Merge "Nano support for extensions and unknown fields."
am d1b8322f: am 0a1429cc: Merge "Nano support for extensions and unknown fields."
am 728a8b78: Merge "Fix the build"
am 08891725: am 728a8b78: Merge "Fix the build"
Merge "Fix outer classname for javamicro/javanano."
Fix checkbuild targets, remove unittest_enum_mulitplejava_nano.proto.
Merge "Fix checkbuild targets, remove unittest_enum_mulitplejava_nano.proto."
am e7b778b9: Merge "Fix outer classname for javamicro/javanano."
am ece98e5f: Merge "Fix checkbuild targets, remove unittest_enum_mulitplejava_nano.proto."
am e7b778b9: Merge "Fix outer classname for javamicro/javanano."
am ece98e5f: Merge "Fix checkbuild targets, remove unittest_enum_mulitplejava_nano.proto."
am a38aedb3: am e7b778b9: Merge "Fix outer classname for javamicro/javanano."
am 48ee66d2: am ece98e5f: Merge "Fix checkbuild targets, remove unittest_enum_mulitplejava_nano.proto."
Merge commit '11c3b27d' into fix-mc
am 7632e0ad: Merge commit \'11c3b27d\' into fix-mc
Merge "Fix some indenting issues with set__() function"
am 44cbb06c: Merge "Fix some indenting issues with set__() function"
am fdbd1e42: am 44cbb06c: Merge "Fix some indenting issues with set__() function"
am 51ef8f39: Merge "Fix compile error on mac 10.9"
am 00310299: am 51ef8f39: Merge "Fix compile error on mac 10.9"
am 51ef8f39: Merge "Fix compile error on mac 10.9"
Merge "Don't reset cachedSize to 0 in getSerializedSize"
am ec0b12c3: Merge "Don\'t reset cachedSize to 0 in getSerializedSize"
am ec0b12c3: Merge "Don\'t reset cachedSize to 0 in getSerializedSize"
am 5b931dc7: am ec0b12c3: Merge "Don\'t reset cachedSize to 0 in getSerializedSize"
Revert "am 5b931dc7: am ec0b12c3: Merge "Don\'t reset cachedSize to 0 in getSerializedSize""
Revert "Don't reset cachedSize to 0 in getSerializedSize"
Merge "Revert "Don't reset cachedSize to 0 in getSerializedSize""
am ce2f5991: Merge "Revert "Don\'t reset cachedSize to 0 in getSerializedSize""
am ce2f5991: Merge "Revert "Don\'t reset cachedSize to 0 in getSerializedSize""
am 8a9fc09c: am ce2f5991: Merge "Revert "Don\'t reset cachedSize to 0 in getSerializedSize""
am f105476a: am e7b778b9: Merge "Fix outer classname for javamicro/javanano."
am 4d7f9ad7: am ece98e5f: Merge "Fix checkbuild targets, remove unittest_enum_mulitplejava_nano.proto."
am ba363f13: am a38aedb3: am e7b778b9: Merge "Fix outer classname for javamicro/javanano."
am df9a6dff: am 48ee66d2: am ece98e5f: Merge "Fix checkbuild targets, remove unittest_enum_mulitplejava_nano.proto."
am adfb09a0: am 7632e0ad: Merge commit \'11c3b27d\' into fix-mc
am d6be7db0: am fdbd1e42: am 44cbb06c: Merge "Fix some indenting issues with set__() function"
am 211bb912: am f105476a: am e7b778b9: Merge "Fix outer classname for javamicro/javanano."
am efa53b19: am 4d7f9ad7: am ece98e5f: Merge "Fix checkbuild targets, remove unittest_enum_mulitplejava_nano.proto."
am 7022c115: am ba363f13: am a38aedb3: am e7b778b9: Merge "Fix outer classname for javamicro/javanano."
am 66a4ccc4: am df9a6dff: am 48ee66d2: am ece98e5f: Merge "Fix checkbuild targets, remove unittest_enum_mulitplejava_nano.proto."
am 662d2f44: am adfb09a0: am 7632e0ad: Merge commit \'11c3b27d\' into fix-mc
am 554bd957: am d6be7db0: am fdbd1e42: am 44cbb06c: Merge "Fix some indenting issues with set__() function"
am 1a4b1d52: am 00310299: am 51ef8f39: Merge "Fix compile error on mac 10.9"
am f213b0c6: am 5b931dc7: am ec0b12c3: Merge "Don\'t reset cachedSize to 0 in getSerializedSize"
am 27243737: am 1a4b1d52: am 00310299: am 51ef8f39: Merge "Fix compile error on mac 10.9"
am d89b3060: am f213b0c6: am 5b931dc7: am ec0b12c3: Merge "Don\'t reset cachedSize to 0 in getSerializedSize"
Merge commit 'e887563a' into fix-merge-conclict
am 3f1679bb: am 8a9fc09c: am ce2f5991: Merge "Revert "Don\'t reset cachedSize to 0 in getSerializedSize""
Merge commit 'f65ee555' into fix-merge-conflict
am 13fb32b1: am 3f1679bb: am 8a9fc09c: am ce2f5991: Merge "Revert "Don\'t reset cachedSize to 0 in getSerializedSize""
Revert "Merge commit 'e887563a' into fix-merge-conclict"
Merge "Revert "Merge commit 'e887563a' into fix-merge-conclict"" into klp-modular-dev-plus-aosp
Revert "Merge commit 'e887563a' into fix-merge-conclict"
am 2b549b79: Merge "Revert "Merge commit \'e887563a\' into fix-merge-conclict"" into klp-modular-dev-plus-aosp
am 77140fb2: am 211bb912: am f105476a: am e7b778b9: Merge "Fix outer classname for javamicro/javanano."
am 05f45faa: am efa53b19: am 4d7f9ad7: am ece98e5f: Merge "Fix checkbuild targets, remove unittest_enum_mulitplejava_nano.proto."
am 50ddd7ad: am 7022c115: am ba363f13: am a38aedb3: am e7b778b9: Merge "Fix outer classname for javamicro/javanano."
am 2fb1789c: am 66a4ccc4: am df9a6dff: am 48ee66d2: am ece98e5f: Merge "Fix checkbuild targets, remove unittest_enum_mulitplejava_nano.proto."
am f3bf0583: am 662d2f44: am adfb09a0: am 7632e0ad: Merge commit \'11c3b27d\' into fix-mc
am b624b3aa: am 554bd957: am d6be7db0: am fdbd1e42: am 44cbb06c: Merge "Fix some indenting issues with set__() function"
am c8f69926: am 27243737: am 1a4b1d52: am 00310299: am 51ef8f39: Merge "Fix compile error on mac 10.9"
am de6420aa: am d89b3060: am f213b0c6: am 5b931dc7: am ec0b12c3: Merge "Don\'t reset cachedSize to 0 in getSerializedSize"
am 7a8797ab: am 77140fb2: am 211bb912: am f105476a: am e7b778b9: Merge "Fix outer classname for javamicro/javanano."
am 02cba9f2: am 05f45faa: am efa53b19: am 4d7f9ad7: am ece98e5f: Merge "Fix checkbuild targets, remove unittest_enum_mulitplejava_nano.proto."
am 9f4f73e2: am 50ddd7ad: am 7022c115: am ba363f13: am a38aedb3: am e7b778b9: Merge "Fix outer classname for javamicro/javanano."
am d801ea90: am 2fb1789c: am 66a4ccc4: am df9a6dff: am 48ee66d2: am ece98e5f: Merge "Fix checkbuild targets, remove unittest_enum_mulitplejava_nano.proto."
am 3a2460f3: am f3bf0583: am 662d2f44: am adfb09a0: am 7632e0ad: Merge commit \'11c3b27d\' into fix-mc
am c6ec950e: am b624b3aa: am 554bd957: am d6be7db0: am fdbd1e42: am 44cbb06c: Merge "Fix some indenting issues with set__() function"
am 0cb1a2f6: am c8f69926: am 27243737: am 1a4b1d52: am 00310299: am 51ef8f39: Merge "Fix compile error on mac 10.9"
am 232698c4: am de6420aa: am d89b3060: am f213b0c6: am 5b931dc7: am ec0b12c3: Merge "Don\'t reset cachedSize to 0 in getSerializedSize"
am a94fe6cb: am 7a8797ab: am 77140fb2: am 211bb912: am f105476a: am e7b778b9: Merge "Fix outer classname for javamicro/javanano."
am 3c00157e: am 02cba9f2: am 05f45faa: am efa53b19: am 4d7f9ad7: am ece98e5f: Merge "Fix checkbuild targets, remove unittest_enum_mulitplejava_nano.proto."
am 1c524da8: am 9f4f73e2: am 50ddd7ad: am 7022c115: am ba363f13: am a38aedb3: am e7b778b9: Merge "Fix outer classname for javamicro/javanano."
am ed67cd79: am d801ea90: am 2fb1789c: am 66a4ccc4: am df9a6dff: am 48ee66d2: am ece98e5f: Merge "Fix checkbuild targets, remove unittest_enum_mulitplejava_nano.proto."
am aa2e7e5f: am 3a2460f3: am f3bf0583: am 662d2f44: am adfb09a0: am 7632e0ad: Merge commit \'11c3b27d\' into fix-mc
am 8973d9e6: am c6ec950e: am b624b3aa: am 554bd957: am d6be7db0: am fdbd1e42: am 44cbb06c: Merge "Fix some indenting issues with set__() function"
am b28d1738: am 0cb1a2f6: am c8f69926: am 27243737: am 1a4b1d52: am 00310299: am 51ef8f39: Merge "Fix compile error on mac 10.9"
am 89f0407f: am 232698c4: am de6420aa: am d89b3060: am f213b0c6: am 5b931dc7: am ec0b12c3: Merge "Don\'t reset cachedSize to 0 in getSerializedSize"
am 291f0484: (-s ours) Merge commit \'f65ee555\' into fix-merge-conflict
am 16aad88f: am 13fb32b1: am 3f1679bb: am 8a9fc09c: am ce2f5991: Merge "Revert "Don\'t reset cachedSize to 0 in getSerializedSize""
am d1439291: Revert "Merge commit \'e887563a\' into fix-merge-conclict"
am f2750dcb: am 2b549b79: Merge "Revert "Merge commit \'e887563a\' into fix-merge-conclict"" into klp-modular-dev-plus-aosp
am 390b6c4b: am 291f0484: (-s ours) Merge commit \'f65ee555\' into fix-merge-conflict
am 6eb7a519: am 16aad88f: am 13fb32b1: am 3f1679bb: am 8a9fc09c: am ce2f5991: Merge "Revert "Don\'t reset cachedSize to 0 in getSerializedSize""
am f13aadfb: am d1439291: Revert "Merge commit \'e887563a\' into fix-merge-conclict"
am 1f891376: am f2750dcb: am 2b549b79: Merge "Revert "Merge commit \'e887563a\' into fix-merge-conclict"" into klp-modular-dev-plus-aosp
am 9160bc69: am 390b6c4b: am 291f0484: (-s ours) Merge commit \'f65ee555\' into fix-merge-conflict
am dc946875: am 6eb7a519: am 16aad88f: am 13fb32b1: am 3f1679bb: am 8a9fc09c: am ce2f5991: Merge "Revert "Don\'t reset cachedSize to 0 in getSerializedSize""
am 8add9962: am f13aadfb: am d1439291: Revert "Merge commit \'e887563a\' into fix-merge-conclict"
am b38ef83f: am 1f891376: am f2750dcb: am 2b549b79: Merge "Revert "Merge commit \'e887563a\' into fix-merge-conclict"" into klp-modular-dev-plus-aosp
Ying Wang (24):
Unbundle protobuffer target libraries.
Unbundle protobuffer target libraries.
am 7cc5f59e: Unbundle protobuffer target libraries.
Build the target protobuf libraries against the NDK
Retire LOCAL_NDK_VERSION.
Retire LOCAL_NDK_VERSION.
am a6d94785: Retire LOCAL_NDK_VERSION.
Build against the NDK for x86 and mips too.
Build against the NDK for x86 and mips too.
am db9ab02c: (-s ours) Build against the NDK for x86 and mips too.
You CANNOT change the global WITH_DEXPREOPT
Merge "You CANNOT change the global WITH_DEXPREOPT"
am 49512cb0: Merge "You CANNOT change the global WITH_DEXPREOPT"
am 94f522f9: am 49512cb0: Merge "You CANNOT change the global WITH_DEXPREOPT"
am bf6d9ec1: am 94f522f9: am 49512cb0: Merge "You CANNOT change the global WITH_DEXPREOPT"
You CANNOT change the global WITH_DEXPREOPT
am 8eed3705: You CANNOT change the global WITH_DEXPREOPT
am 403cc927: am 8eed3705: You CANNOT change the global WITH_DEXPREOPT
am 165d4d7e: am bf6d9ec1: am 94f522f9: am 49512cb0: Merge "You CANNOT change the global WITH_DEXPREOPT"
am f25e1e6b: am 165d4d7e: am bf6d9ec1: am 94f522f9: am 49512cb0: Merge "You CANNOT change the global WITH_DEXPREOPT"
am b09fd32d: am f25e1e6b: am 165d4d7e: am bf6d9ec1: am 94f522f9: am 49512cb0: Merge "You CANNOT change the global WITH_DEXPREOPT"
am 4c8e5262: am 403cc927: am 8eed3705: You CANNOT change the global WITH_DEXPREOPT
am cca3823d: am 4c8e5262: am 403cc927: am 8eed3705: You CANNOT change the global WITH_DEXPREOPT
am e9d25570: am cca3823d: am 4c8e5262: am 403cc927: am 8eed3705: You CANNOT change the global WITH_DEXPREOPT
abyss7 (1):
Silence -Wsign-compare warning on Mac
acidtonic (1):
Corrected code example in coded_stream.h
Łukasz Twarduś (1):
Fix "anonymous types declared in an anonymous union are an extension"
-----------------------------------------------------------------------
No new revisions were added by this update.
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-protobuf/pkg-protobuf.git
More information about the Pkg-protobuf-devel
mailing list