aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Extension overhaul.Max Cai2014-01-1016-538/+1142
* Merge "Fix MessageNanoPrinter for accessors"Andrew Flynn2013-12-193-25/+102
|\
| * Fix MessageNanoPrinter for accessorsAndrew Flynn2013-12-123-25/+102
|/
* Merge "Avoid class initializers to help ProGuard."Max Cai2013-12-1012-94/+248
|\
| * Avoid class initializers to help ProGuard.Max Cai2013-12-1012-94/+248
|/
* Merge "Nano: don't generate accessor methods for nested methods"Max Cai2013-12-105-138/+53
|\
| * Nano: don't generate accessor methods for nested methodsAndrew Flynn2013-12-095-138/+53
* | Merge commit '0afd5a4d782037ea641d75d595cf5d38ed6978ac' into HEADThe Android Open Source Project2013-12-050-0/+0
|\ \ | |/ |/|
| * am 3e0d99fa: Merge "Update MessageNano#toString() to return mostly valid Text...Max Cai2013-11-153-40/+84
| |\
| * \ am 332076f0: Merge "Fix warnings warnings in header files, hide others."Max Cai2013-11-153-6/+10
| |\ \
| * \ \ am ac8e2e15: Merge "Minimize method count for nanoproto."Max Cai2013-11-124-63/+112
| |\ \ \
| * \ \ \ am 8a15121c: Merge "Allow for ref-type arrays containing null elements."Max Cai2013-11-063-22/+82
| |\ \ \ \
| * \ \ \ \ am bb971d53: Merge "Implement hashCode() and equals() behind a generator opti...Max Cai2013-10-2517-65/+915
| |\ \ \ \ \
* | \ \ \ \ \ Merge commit '7cb6b37f3799affce9e1be39977d4419283df795' into HEADThe Android Open Source Project2013-11-221-0/+1
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am 42be1e79: Merge "Feature request: set() and clear() accessors return this"Max Cai2013-10-164-17/+33
| |\ \ \ \ \ \
| * \ \ \ \ \ \ am c50f605c: Merge "Make generated code more aligned with Google Java style."Max Cai2013-10-166-55/+78
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ am afaf74ce: Merge "Fix repeated field merging semantics."Max Cai2013-10-166-37/+193
| |\ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ am 63e819ad: Merge "Protect against null repeated fields."Max Cai2013-10-155-21/+78
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ am c85806ba: Merge remote-tracking branch \'goog/klp-dev-plus-aosp\' into tom...Max Cai2013-10-150-0/+0
| |\ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'goog/klp-dev-plus-aosp' into tomergeMax Cai2013-10-1125-104/+1410
| | |\ \ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ \ am 39cee9f1: Merge "Remove all field initializers and let ctor call clear()."Max Cai2013-10-114-14/+18
| |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | am cbb08132: Merge "Add missing README parts for enum_style and in-repo usage"Ulas Kirazci2013-10-101-3/+51
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ am c4a1b547: Merge "Add reftypes field generator option."Ulas Kirazci2013-10-099-29/+287
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ am 44cbb06c: Merge "Fix some indenting issues with set__() function"Wink Saville2013-10-091-10/+6
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 9827c718: Merge "Fix roundtrip failure with groups when unknown fields are...Ulas Kirazci2013-10-043-2/+30
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 44dc2f1e: Merge "Implement enum_style=java option."Ulas Kirazci2013-09-288-23/+195
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 0d035e9b: Merge "Accessor style for optional fields."Ulas Kirazci2013-09-2815-63/+719
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am cc652daa: Merge "Add some bitfield helper methods from 2.4"Ulas Kirazci2013-09-242-0/+102
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 9e6afdf9: Merge "Add two codegen parameters to nano."Ulas Kirazci2013-09-242-2/+30
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge commit '11c3b27d' into fix-mcWink Saville2013-08-131-1/+19
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | am ece98e5f: Merge "Fix checkbuild targets, remove unittest_enum_mulitplejava...Wink Saville2013-08-081-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am e7b778b9: Merge "Fix outer classname for javamicro/javanano."Wink Saville2013-08-0827-497/+718
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 87c8e31b: Merge "Fixed packed repeated serialization."Ulas Kirazci2013-07-313-30/+48
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am be47f55e: Merge "Add an option to inspect "has" state upon parse."Ulas Kirazci2013-07-2910-31/+273
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 021f8f1b: Merge "Add test for passing in proto params."Ulas Kirazci2013-07-262-1/+25
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am ac5a239e: Merge "Per-file java_multiple_files flag."Ulas Kirazci2013-07-2516-43/+230
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 3099f911: am 19c4090e: Merge "Allow NaN/+inf/-inf defaults in micro/nano."Ulas Kirazci2013-07-237-8/+141
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am f604f71a: am a400007e: Merge "Add contribution instructions for nano."Ulas Kirazci2013-07-191-0/+18
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 4c18ce2d: am aad4b307: Merge "Update nano to serialize java keywords prope...Ulas Kirazci2013-07-1910-11/+72
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added micro/nano configurations to protobuf in gradle.Adam Metcalf2013-07-151-36/+36
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 67b43035: am 8cf17a8f: Merge "Make it possible to use MessageNano.mergeFro...Ulas Kirazci2013-07-113-4/+13
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 7bb086c8: am eda87c5c: Merge "Fix vanilla make build."Ulas Kirazci2013-07-112-0/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 08891725: am 728a8b78: Merge "Fix the build"Wink Saville2013-07-112-4/+14
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am d1b8322f: am 0a1429cc: Merge "Nano support for extensions and unknown fiel...Wink Saville2013-06-2515-25/+812
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Gradle project file.Adam Metcalf2013-06-171-0/+51
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Align with main: two ways of parsing repeated packable fields."Max Cai2013-11-1811-106/+326
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Align with main: two ways of parsing repeated packable fields.Max Cai2013-11-1811-106/+326
|/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Update MessageNano#toString() to return mostly valid TextFormat."Max Cai2013-11-153-40/+84
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update MessageNano#toString() to return mostly valid TextFormat.Nicholas Seckar2013-11-153-40/+84
| | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Fix warnings warnings in header files, hide others."Max Cai2013-11-153-6/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
generated by cgit v1.1 at 2024-06-12 08:57:26 +0000