aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Add test for passing in proto params.Ulas Kirazci2013-07-252-1/+25
* 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
* | | am 4e76e72b: Merge "Fix javanano compiler generating uncompileable java code....Wink Saville2013-06-052-0/+64
|\| |
| * | Merge "Fix javanano compiler generating uncompileable java code. This happene...Wink Saville2013-06-062-0/+64
| |\ \ | | |/ | |/|
| | * Fix javanano compiler generating uncompileable java code. This happenedBrian Duff2013-06-052-0/+64
| |/
* | am d29f87c7: Merge "Fix typos in protobuf readme."Wink Saville2013-04-291-7/+7
|\|
| * Merge "Fix typos in protobuf readme."Wink Saville2013-04-291-7/+7
| |\
| | * Fix typos in protobuf readme.Matt Thrailkill2013-04-261-7/+7
| |/
* | am e0ee97ea: Merge "Don\'t use Arrays.copyOf in generated code."Ficus Kirkpatrick2013-04-083-4/+20
|\|
| * Merge "Don't use Arrays.copyOf in generated code."Ficus Kirkpatrick2013-04-093-4/+20
| |\
| | * Don't use Arrays.copyOf in generated code.Ficus Kirkpatrick2013-04-083-4/+20
| |/
* | am a6b79eb9: Merge "Prevent conflicts between local and proto variable names."Wink Saville2013-04-040-0/+0
|\|
| * Merge "Prevent conflicts between local and proto variable names."Wink Saville2013-04-048-118/+68
| |\
| | * Prevent conflicts between local and proto variable names.Ulas Kirazci2013-04-038-118/+68
| |/
* | am fb8f78fe: Prevent conflicts between local and proto variable names.Ulas Kirazci2013-04-048-118/+68
|\ \
| * | Prevent conflicts between local and proto variable names.Ulas Kirazci2013-04-048-118/+68
* | | am 43325653: Nano protobufs.Ulas Kirazci2013-04-030-0/+0
|\| |
| * | Nano protobufs.Ulas Kirazci2013-04-0333-0/+7904
* | | am 216c9e86: Merge "Nano protobufs."Wink Saville2013-04-0133-0/+7904
|\ \ \ | |/ / |/| / | |/
| * Merge "Nano protobufs."Wink Saville2013-04-0133-0/+7904
| |\
| | * Nano protobufs.Ulas Kirazci2013-04-0133-0/+7904
| |/
* | am db9ab02c: (-s ours) Build against the NDK for x86 and mips too.Ying Wang2012-12-140-0/+0
|\|
| * Build against the NDK for x86 and mips too.Ying Wang2012-12-141-6/+8
* | Add gnustl+rtti version of cpp full libraryPrzemyslaw Szczepaniak2012-11-081-8/+32
* | Build against the NDK for x86 and mips too.Ying Wang2012-09-071-6/+8
* | am a6d94785: Retire LOCAL_NDK_VERSION.Ying Wang2012-08-140-0/+0
|\|
| * Retire LOCAL_NDK_VERSION.Ying Wang2012-08-141-9/+6
* | Retire LOCAL_NDK_VERSION.Ying Wang2012-08-141-9/+6
|/