aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Add reftypes field generator option.Brian Duff2013-10-079-29/+287
* Merge "Fix roundtrip failure with groups when unknown fields are enabled."Ulas Kirazci2013-10-043-2/+30
|\
| * Fix roundtrip failure with groups when unknown fields are enabled.Nicholas Seckar2013-10-043-2/+30
|/
* Merge "Implement enum_style=java option."Ulas Kirazci2013-09-288-23/+195
|\
| * Implement enum_style=java option.Max Cai2013-09-258-23/+195
* | Merge "Accessor style for optional fields."Ulas Kirazci2013-09-2815-63/+719
|\ \ | |/
| * Accessor style for optional fields.Max Cai2013-09-2315-63/+719
* | Merge "Add some bitfield helper methods from 2.4"Ulas Kirazci2013-09-242-0/+102
|\ \ | |/
| * Add some bitfield helper methods from 2.4Max Cai2013-09-202-0/+102
* | Merge "Add two codegen parameters to nano."Ulas Kirazci2013-09-242-2/+30
|\ \ | |/
| * Add two codegen parameters to nano.Max Cai2013-09-182-2/+30
|/
* Merge "Add a Gradle build file for the protobuf libraries."Wink Saville2013-08-131-0/+68
|\
| * Add a Gradle build file for the protobuf libraries.Adam Metcalf2013-08-081-0/+68
|/
* Merge "Fix checkbuild targets, remove unittest_enum_mulitplejava_nano.proto."Wink Saville2013-08-081-2/+2
|\
| * Fix checkbuild targets, remove unittest_enum_mulitplejava_nano.proto.Wink Saville2013-08-071-2/+2
|/
* Merge "Fix outer classname for javamicro/javanano."Wink Saville2013-08-0727-497/+718
|\
| * Fix outer classname for javamicro/javanano.Max Cai2013-08-0527-497/+718
* | Merge "Fixed packed repeated serialization."Ulas Kirazci2013-07-313-30/+48
|\ \ | |/ |/|
| * Fixed packed repeated serialization.Ulas Kirazci2013-07-313-30/+48
* | Merge "Add an option to inspect "has" state upon parse."Ulas Kirazci2013-07-2910-31/+273
|\ \ | |/ |/|
| * Add an option to inspect "has" state upon parse.Ulas Kirazci2013-07-2910-31/+273
|/
* Merge "Add test for passing in proto params."Ulas Kirazci2013-07-262-1/+25
|\
| * Add test for passing in proto params.Ulas Kirazci2013-07-252-1/+25
* | Merge "Per-file java_multiple_files flag."Ulas Kirazci2013-07-2616-43/+230
|\ \ | |/ |/|
| * Per-file java_multiple_files flag.Max Cai2013-07-2516-43/+230
|/
* am 19c4090e: Merge "Allow NaN/+inf/-inf defaults in micro/nano."Ulas Kirazci2013-07-237-8/+141
|\
| * Merge "Allow NaN/+inf/-inf defaults in micro/nano."Ulas Kirazci2013-07-237-8/+141
| |\
| | * Allow NaN/+inf/-inf defaults in micro/nano.Chris Smith2013-07-237-8/+141
| |/
* | am a400007e: Merge "Add contribution instructions for nano."Ulas Kirazci2013-07-191-0/+18
|\ \ | |/
| * Merge "Add contribution instructions for nano."Ulas Kirazci2013-07-191-0/+18
| |\
| | * Add contribution instructions for nano.Ulas Kirazci2013-07-191-0/+18
* | | am aad4b307: Merge "Update nano to serialize java keywords properly."Ulas Kirazci2013-07-1910-11/+72
|\ \ \ | |/ /
| * | Merge "Update nano to serialize java keywords properly."Ulas Kirazci2013-07-1910-11/+72
| |\ \ | | |/ | |/|
| | * Update nano to serialize java keywords properly.Tom Chao2013-07-1910-11/+72
| |/
* | am 8cf17a8f: Merge "Make it possible to use MessageNano.mergeFrom without cas...Ulas Kirazci2013-07-093-4/+13
|\ \ | |/
| * Merge "Make it possible to use MessageNano.mergeFrom without casting."Ulas Kirazci2013-07-093-4/+13
| |\
| | * Make it possible to use MessageNano.mergeFrom without casting.Brian Duff2013-07-083-4/+13
* | | am eda87c5c: Merge "Fix vanilla make build."Ulas Kirazci2013-07-092-0/+2
|\ \ \ | |/ /
| * | Merge "Fix vanilla make build."Ulas Kirazci2013-07-092-0/+2
| |\ \
| | * | Fix vanilla make build.Ulas Kirazci2013-07-092-0/+2
| |/ /
* | | am 728a8b78: Merge "Fix the build"Wink Saville2013-07-092-4/+14
|\ \ \ | |/ /
| * | Merge "Fix the build"Wink Saville2013-07-092-4/+14
| |\ \ | | |/ | |/|
| | * Fix the buildEvan Charlton2013-07-092-4/+14
| |/
* | am 0a1429cc: Merge "Nano support for extensions and unknown fields."Wink Saville2013-06-2515-25/+812
|\ \ | |/
| * Merge "Nano support for extensions and unknown fields."Wink Saville2013-06-2515-25/+812
| |\
| | * Nano support for extensions and unknown fields.Brian Duff2013-06-2415-25/+812
| |/
* | am 9459b5c4: Merge "Fix enum field references with java_multiple_files."Wink Saville2013-06-072-4/+18
|\ \ | |/
| * Merge "Fix enum field references with java_multiple_files."Wink Saville2013-06-072-4/+18
| |\
| | * Fix enum field references with java_multiple_files.Brian Duff2013-06-072-4/+18
| |/
* | am 6f59b383: Merge "Add toString() method to MessageNano."Wink Saville2013-06-063-0/+241
|\ \ | |/