1365 Commits (0f2e72668d1a07c71988c8e20f4f90f356de70c8)
 

Author SHA1 Message Date
Ulas Kirazci 12d1e72c16 am aad4b307: Merge "Update nano to serialize java keywords properly." 12 years ago
Ulas Kirazci 86595020a8 Merge "Update nano to serialize java keywords properly." 12 years ago
Tom Chao d4bb971d18 Update nano to serialize java keywords properly. 12 years ago
Ulas Kirazci ff76a106b3 am 67b43035: am 8cf17a8f: Merge "Make it possible to use MessageNano.mergeFrom without casting." 12 years ago
Ulas Kirazci 7c80ff1387 am 7bb086c8: am eda87c5c: Merge "Fix vanilla make build." 12 years ago
Wink Saville a3382b272e am 08891725: am 728a8b78: Merge "Fix the build" 12 years ago
Ulas Kirazci ba74aabea5 am 8cf17a8f: Merge "Make it possible to use MessageNano.mergeFrom without casting." 12 years ago
Ulas Kirazci b8f5dad1c7 Merge "Make it possible to use MessageNano.mergeFrom without casting." 12 years ago
Ulas Kirazci 51f5dcfb1f am eda87c5c: Merge "Fix vanilla make build." 12 years ago
Wink Saville ee011ab712 am 728a8b78: Merge "Fix the build" 12 years ago
Brian Duff a9c4e082e0 Make it possible to use MessageNano.mergeFrom without casting. 12 years ago
Wink Saville cb1a5d10d8 am d1b8322f: am 0a1429cc: Merge "Nano support for extensions and unknown fields." 12 years ago
Wink Saville 50acfdac08 am 0a1429cc: Merge "Nano support for extensions and unknown fields." 12 years ago
Wink Saville 499f47ffdb Merge "Nano support for extensions and unknown fields." 12 years ago
Brian Duff 5659cca8c8 Nano support for extensions and unknown fields. 12 years ago
Wink Saville ad5805216d am 9459b5c4: Merge "Fix enum field references with java_multiple_files." 12 years ago
Wink Saville 661f87ceb8 Merge "Fix enum field references with java_multiple_files." 12 years ago
Brian Duff a220fe61e1 Fix enum field references with java_multiple_files. 12 years ago
Wink Saville 5f492841b3 am 6f59b383: Merge "Add toString() method to MessageNano." 12 years ago
Wink Saville 63d4b5fd57 Merge "Add toString() method to MessageNano." 12 years ago
Wink Saville 1fa7217531 am 4e76e72b: Merge "Fix javanano compiler generating uncompileable java code. This happened for enums when java_multiple_files=true." 12 years ago
Wink Saville b0874cc632 Merge "Fix javanano compiler generating uncompileable java code. This happened for enums when java_multiple_files=true." 12 years ago
Brian Duff 296787577a Fix javanano compiler generating uncompileable java code. This happened 12 years ago
Andrew Flynn a16121550b Add toString() method to MessageNano. 12 years ago
Wink Saville 16ab1961a1 am d29f87c7: Merge "Fix typos in protobuf readme." 12 years ago
Wink Saville bb9b49029e Merge "Fix typos in protobuf readme." 12 years ago
Matt Thrailkill adf95183f6 Fix typos in protobuf readme. 12 years ago
Ficus Kirkpatrick fbbe842a19 am e0ee97ea: Merge "Don\'t use Arrays.copyOf in generated code." 12 years ago
Ficus Kirkpatrick 4349e11df9 Merge "Don't use Arrays.copyOf in generated code." 12 years ago
Ficus Kirkpatrick 314a302933 Don't use Arrays.copyOf in generated code. 12 years ago
Wink Saville 12ac3a7e7f am a6b79eb9: Merge "Prevent conflicts between local and proto variable names." 12 years ago
Ulas Kirazci 4380449c7a am fb8f78fe: Prevent conflicts between local and proto variable names. 12 years ago
Ulas Kirazci 741f208bb9 Prevent conflicts between local and proto variable names. 12 years ago
Wink Saville d4bb580f1b Merge "Prevent conflicts between local and proto variable names." 12 years ago
Ulas Kirazci 3234cee5ba Prevent conflicts between local and proto variable names. 12 years ago
Ulas Kirazci 86ce4717ee am 43325653: Nano protobufs. 12 years ago
Ulas Kirazci d6592c758c Nano protobufs. 12 years ago
Wink Saville 08b6e50a9b am 216c9e86: Merge "Nano protobufs." 12 years ago
Wink Saville 64a842122c Merge "Nano protobufs." 12 years ago
Ulas Kirazci 2337023fd9 Nano protobufs. 12 years ago
xiaofeng@google.com c9f69500b7 Update OSGi meta data. 12 years ago
xiaofeng@google.com 25b2a673ae Fix issue 474 12 years ago
xiaofeng@google.com 7f4c9e860e Add a comment about the new "allow_alias" option. 12 years ago
xiaofeng@google.com 7fe28a8973 Update version number in descriptor.pb.h and plugin.pb.h 12 years ago
xiaofeng@google.com 2c9392f8dd Update version number in trunk 12 years ago
xiaofeng@google.com a36f1b43e7 Exclude a failing test in MingW build. 12 years ago
xiaofeng@google.com 7f372559cc Down-integrate from internal branch 12 years ago
xiaofeng@google.com de3494fe5c Fix issue 403, issue 456, issue 462 12 years ago
xiaofeng@google.com e406747cd5 Fix issue 445, issue 449 12 years ago
xiaofeng@google.com 1e5a5e8419 Down-integrate from internal branch 12 years ago