| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge "Don't serialize required fields whose 'has' flags are unset." | Max Cai | 2014-01-13 | 4 | -6/+15 |
| |\ | |||||
| | * | Don't serialize required fields whose 'has' flags are unset. | Max Cai | 2014-01-10 | 4 | -6/+15 |
| |/ | |||||
| * | Merge "Fix MessageNanoPrinter for accessors" | Andrew Flynn | 2013-12-19 | 3 | -25/+102 |
| |\ | |||||
| | * | Fix MessageNanoPrinter for accessors | Andrew Flynn | 2013-12-12 | 3 | -25/+102 |
| |/ | |||||
| * | Merge "Avoid class initializers to help ProGuard." | Max Cai | 2013-12-10 | 12 | -94/+248 |
| |\ | |||||
| | * | Avoid class initializers to help ProGuard. | Max Cai | 2013-12-10 | 12 | -94/+248 |
| |/ | |||||
| * | Merge "Nano: don't generate accessor methods for nested methods" | Max Cai | 2013-12-10 | 5 | -138/+53 |
| |\ | |||||
| | * | Nano: don't generate accessor methods for nested methods | Andrew Flynn | 2013-12-09 | 5 | -138/+53 |
| * | | Merge commit '0afd5a4d782037ea641d75d595cf5d38ed6978ac' into HEAD | The Android Open Source Project | 2013-12-05 | 0 | -0/+0 |
| |\ \ | |/ |/| | |||||
| | * | am 3e0d99fa: Merge "Update MessageNano#toString() to return mostly valid Text... | Max Cai | 2013-11-15 | 3 | -40/+84 |
| | |\ | |||||
| | * \ | am 332076f0: Merge "Fix warnings warnings in header files, hide others." | Max Cai | 2013-11-15 | 3 | -6/+10 |
| | |\ \ | |||||
| | * \ \ | am ac8e2e15: Merge "Minimize method count for nanoproto." | Max Cai | 2013-11-12 | 4 | -63/+112 |
| | |\ \ \ | |||||
| | * \ \ \ | am 8a15121c: Merge "Allow for ref-type arrays containing null elements." | Max Cai | 2013-11-06 | 3 | -22/+82 |
| | |\ \ \ \ | |||||
| | * \ \ \ \ | am bb971d53: Merge "Implement hashCode() and equals() behind a generator opti... | Max Cai | 2013-10-25 | 17 | -65/+915 |
| | |\ \ \ \ \ | |||||
| * | \ \ \ \ \ | Merge commit '7cb6b37f3799affce9e1be39977d4419283df795' into HEAD | The Android Open Source Project | 2013-11-22 | 1 | -0/+1 |
| |\ \ \ \ \ \ \ | |/ / / / / / | |||||
| | * | | | | | | am 42be1e79: Merge "Feature request: set() and clear() accessors return this" | Max Cai | 2013-10-16 | 4 | -17/+33 |
| | |\ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ | am c50f605c: Merge "Make generated code more aligned with Google Java style." | Max Cai | 2013-10-16 | 6 | -55/+78 |
| | |\ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ | am afaf74ce: Merge "Fix repeated field merging semantics." | Max Cai | 2013-10-16 | 6 | -37/+193 |
| | |\ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ | am 63e819ad: Merge "Protect against null repeated fields." | Max Cai | 2013-10-15 | 5 | -21/+78 |
| | |\ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ | am c85806ba: Merge remote-tracking branch \'goog/klp-dev-plus-aosp\' into tom... | Max Cai | 2013-10-15 | 0 | -0/+0 |
| | |\ \ \ \ \ \ \ \ \ \ | |||||
| | | * \ \ \ \ \ \ \ \ \ | Merge remote-tracking branch 'goog/klp-dev-plus-aosp' into tomerge | Max Cai | 2013-10-11 | 25 | -104/+1410 |
| | | |\ \ \ \ \ \ \ \ \ \ | |||||
| | * | \ \ \ \ \ \ \ \ \ \ | am 39cee9f1: Merge "Remove all field initializers and let ctor call clear()." | Max Cai | 2013-10-11 | 4 | -14/+18 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | |_|/ / / / / / / / / / | |/| | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | am cbb08132: Merge "Add missing README parts for enum_style and in-repo usage" | Ulas Kirazci | 2013-10-10 | 1 | -3/+51 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ | am c4a1b547: Merge "Add reftypes field generator option." | Ulas Kirazci | 2013-10-09 | 9 | -29/+287 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ | am 44cbb06c: Merge "Fix some indenting issues with set__() function" | Wink Saville | 2013-10-09 | 1 | -10/+6 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am 9827c718: Merge "Fix roundtrip failure with groups when unknown fields are... | Ulas Kirazci | 2013-10-04 | 3 | -2/+30 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am 44dc2f1e: Merge "Implement enum_style=java option." | Ulas Kirazci | 2013-09-28 | 8 | -23/+195 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am 0d035e9b: Merge "Accessor style for optional fields." | Ulas Kirazci | 2013-09-28 | 15 | -63/+719 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am cc652daa: Merge "Add some bitfield helper methods from 2.4" | Ulas Kirazci | 2013-09-24 | 2 | -0/+102 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am 9e6afdf9: Merge "Add two codegen parameters to nano." | Ulas Kirazci | 2013-09-24 | 2 | -2/+30 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | Merge commit '11c3b27d' into fix-mc | Wink Saville | 2013-08-13 | 1 | -1/+19 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | | | | | am ece98e5f: Merge "Fix checkbuild targets, remove unittest_enum_mulitplejava... | Wink Saville | 2013-08-08 | 1 | -2/+2 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am e7b778b9: Merge "Fix outer classname for javamicro/javanano." | Wink Saville | 2013-08-08 | 27 | -497/+718 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am 87c8e31b: Merge "Fixed packed repeated serialization." | Ulas Kirazci | 2013-07-31 | 3 | -30/+48 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am be47f55e: Merge "Add an option to inspect "has" state upon parse." | Ulas Kirazci | 2013-07-29 | 10 | -31/+273 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am 021f8f1b: Merge "Add test for passing in proto params." | Ulas Kirazci | 2013-07-26 | 2 | -1/+25 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am ac5a239e: Merge "Per-file java_multiple_files flag." | Ulas Kirazci | 2013-07-25 | 16 | -43/+230 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am 3099f911: am 19c4090e: Merge "Allow NaN/+inf/-inf defaults in micro/nano." | Ulas Kirazci | 2013-07-23 | 7 | -8/+141 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am f604f71a: am a400007e: Merge "Add contribution instructions for nano." | Ulas Kirazci | 2013-07-19 | 1 | -0/+18 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am 4c18ce2d: am aad4b307: Merge "Update nano to serialize java keywords prope... | Ulas Kirazci | 2013-07-19 | 10 | -11/+72 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added micro/nano configurations to protobuf in gradle. | Adam Metcalf | 2013-07-15 | 1 | -36/+36 |
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am 67b43035: am 8cf17a8f: Merge "Make it possible to use MessageNano.mergeFro... | Ulas Kirazci | 2013-07-11 | 3 | -4/+13 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am 7bb086c8: am eda87c5c: Merge "Fix vanilla make build." | Ulas Kirazci | 2013-07-11 | 2 | -0/+2 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am 08891725: am 728a8b78: Merge "Fix the build" | Wink Saville | 2013-07-11 | 2 | -4/+14 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | am d1b8322f: am 0a1429cc: Merge "Nano support for extensions and unknown fiel... | Wink Saville | 2013-06-25 | 15 | -25/+812 |
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Gradle project file. | Adam Metcalf | 2013-06-17 | 1 | -0/+51 |
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Align with main: two ways of parsing repeated packable fields." | Max Cai | 2013-11-18 | 11 | -106/+326 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Align with main: two ways of parsing repeated packable fields. | Max Cai | 2013-11-18 | 11 | -106/+326 |
| |/ / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / | |||||
| * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Merge "Update MessageNano#toString() to return mostly valid TextFormat." | Max Cai | 2013-11-15 | 3 | -40/+84 |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |||||
| | * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update MessageNano#toString() to return mostly valid TextFormat. | Nicholas Seckar | 2013-11-15 | 3 | -40/+84 |
| | | |_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |||||
 |
index : external_protobuf.git | |
| Unnamed repository; edit this file 'description' to name the repository. | git repository hosting |
| aboutsummaryrefslogtreecommitdiffstats |