aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Add missing README parts for enum_style and in-repo usageMax Cai2013-10-101-3/+51
* Merge "Add reftypes field generator option."Ulas Kirazci2013-10-098-29/+281
|\
| * Add reftypes field generator option.Brian Duff2013-10-078-29/+281
* | Merge "Fix some indenting issues with set__() function"Wink Saville2013-10-091-10/+6
|\ \ | |/ |/|
| * Fix some indenting issues with set__() functionAndrew Flynn2013-10-081-10/+6
|/
* 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-287-23/+187
|\
| * Implement enum_style=java option.Max Cai2013-09-257-23/+187
* | Merge "Accessor style for optional fields."Ulas Kirazci2013-09-2814-63/+713
|\|
| * Accessor style for optional fields.Max Cai2013-09-2314-63/+713
* | 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 "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-0714-312/+462
|\
| * Fix outer classname for javamicro/javanano.Max Cai2013-08-0514-312/+462
* | 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-299-31/+265
|\ \ | |/ |/|
| * Add an option to inspect "has" state upon parse.Ulas Kirazci2013-07-299-31/+265
|/
* 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-268-24/+117
|\ \ | |/ |/|
| * Per-file java_multiple_files flag.Max Cai2013-07-258-24/+117
|/
* am 19c4090e: Merge "Allow NaN/+inf/-inf defaults in micro/nano."Ulas Kirazci2013-07-234-4/+97
|\
| * Merge "Allow NaN/+inf/-inf defaults in micro/nano."Ulas Kirazci2013-07-234-4/+97
| |\
| | * Allow NaN/+inf/-inf defaults in micro/nano.Chris Smith2013-07-234-4/+97
| |/
* | 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-090-0/+0
|\|
* | am 728a8b78: Merge "Fix the build"Wink Saville2013-07-090-0/+0
|\|
* | am 0a1429cc: Merge "Nano support for extensions and unknown fields."Wink Saville2013-06-2514-25/+806
|\|
| * Merge "Nano support for extensions and unknown fields."Wink Saville2013-06-2514-25/+806
| |\
| | * Nano support for extensions and unknown fields.Brian Duff2013-06-2414-25/+806
| |/
* | 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
|\|
| * Merge "Add toString() method to MessageNano."Wink Saville2013-06-063-0/+241
| |\
| | * Add toString() method to MessageNano.Andrew Flynn2013-06-043-0/+241