1145 Commits (4c92289766d76f276b322ab254ef039f670f41b1)
 

Author SHA1 Message Date
Max Cai 80241687af am 0068978c: Merge "Fixed octal printing of bytearrays" 10 years ago
Max Cai 9d9cb7c330 Merge "Fixed octal printing of bytearrays" 10 years ago
Max Cai be60c85171 am 77866143: Merge "Revert "Fixed octal printing of bytearrays"" 10 years ago
Max Cai a609653bd3 am 238e0ac5: Merge "Fixed octal printing of bytearrays" 10 years ago
Linus Tufvesson 2d60e102fa Fixed octal printing of bytearrays 10 years ago
Feng Xiao b168d1fd1d Fix the formating of bold text. 10 years ago
Feng Xiao 17007a6c47 Update README.md to markdown format. 10 years ago
Feng Xiao bc72de8ea0 Rename README.txt to README.md 10 years ago
Jisi Liu 0068a929ed Merge pull request #4 from google/fix_readme 10 years ago
Max Cai 2b69e07cf3 Merge "Revert "Fixed octal printing of bytearrays"" 10 years ago
Feng Xiao de00052be7 Add instructions on how to generate the configure script. 10 years ago
Max Cai 42da25e969 Revert "Fixed octal printing of bytearrays" 10 years ago
Max Cai 04f70ef5c7 Merge "Fixed octal printing of bytearrays" 10 years ago
Linus Tufvesson 32a45d0921 Fixed octal printing of bytearrays 10 years ago
David Hirschfeld ef6eff20bd Explicitly specify pyext/cpp_message.py in py_modules list 10 years ago
David Hirschfeld b7ec1a95d2 Added const qualifier to iterator to enable compiling with VS2008 10 years ago
Feng Xiao e9c00d9dd0 Rename COPYING.txt to LICENSE for opensource compliance and update links 10 years ago
jieluo@google.com a21bf2e646 merge 2.6.0 to trunk 10 years ago
jieluo@google.com 1eba9d9c74 merge tags/2.6.0 into trunk 10 years ago
Max Cai 274705a916 am c6d612ac: am ecb2c88b: am 55ef21bc: am a88808d4: Merge "Fix access around unknownFieldData." 10 years ago
Max Cai 1dad0f2307 am b172d667: am 2e6d4ae0: am f39998c2: am daf63839: Merge "Keep pointers to extension values." 10 years ago
Ying Wang 08dd6049ee am e9d25570: am cca3823d: am 4c8e5262: am 403cc927: am 8eed3705: You CANNOT change the global WITH_DEXPREOPT 10 years ago
Baligh Uddin c64af59b6f am b088989c: am 57e2ee78: am f8b1f831: am 39467629: am 6c915d3a: keep history after reset to 1fd235cbb5975e117909c73e5e3a579ae4c28dce 10 years ago
Wink Saville 944f597185 am b38ef83f: am 1f891376: am f2750dcb: am 2b549b79: Merge "Revert "Merge commit \'e887563a\' into fix-merge-conclict"" into klp-modular-dev-plus-aosp 10 years ago
Wink Saville df60b2505d am 8add9962: am f13aadfb: am d1439291: Revert "Merge commit \'e887563a\' into fix-merge-conclict" 10 years ago
Jan-Willem Maarse c430d41033 am 1944e19c: am a3ab4364: am 67ebd315: am 399cf8d6: am 1fd235cb: am 70eec2ca: am 58eb8e98: am d20f0a42: Merge "Fix NPE when clearing an extension in nano protos" 10 years ago
Bill Yi c1a565c4d0 am 7f3f30e9: am d0f3ba60: am 0e54db6b: am 8b5d62a4: am f4af48ae: am 9dde6a6d: am ddeaf256: Merge commit \'ba89934bdae7f4256c94a0a24992903a114e764f\' into HEAD 10 years ago
Jeff Davidson d777adae82 am 7bf58728: am 3656cc20: am cd8a72c7: am 7b4e8c78: am 8113c186: resolved conflicts for merge of 592b6078 to master 10 years ago
Max Cai 6745fbb9ea am ee16014e: am f613f9e7: am 3af26f43: am e69eaa22: am 99c98018: am 43365182: am 829f6c01: Merge "Adds --ignore_service nano proto compiler flag" 10 years ago
Max Cai 2e738aa77c am 2b469993: am 61317c32: am 90048528: am 888cafe4: am dd38a37e: am 0391f00b: am ea68d73c: Merge "Don\'t reset cachedSize to 0 in getSerializedSize" 10 years ago
Wink Saville fce0ffdf13 am dc946875: am 6eb7a519: am 16aad88f: am 13fb32b1: am 3f1679bb: am 8a9fc09c: am ce2f5991: Merge "Revert "Don\'t reset cachedSize to 0 in getSerializedSize"" 10 years ago
Wink Saville 9378b718d1 am 9160bc69: am 390b6c4b: am 291f0484: (-s ours) Merge commit \'f65ee555\' into fix-merge-conflict 10 years ago
Max Cai dd49d0a1e9 am ecb2c88b: am 55ef21bc: am a88808d4: Merge "Fix access around unknownFieldData." 10 years ago
Max Cai e57ee765da am 2e6d4ae0: am f39998c2: am daf63839: Merge "Keep pointers to extension values." 10 years ago
Ying Wang 11985d9b4e am cca3823d: am 4c8e5262: am 403cc927: am 8eed3705: You CANNOT change the global WITH_DEXPREOPT 10 years ago
Baligh Uddin 3d5bce541d am 57e2ee78: am f8b1f831: am 39467629: am 6c915d3a: keep history after reset to 1fd235cbb5975e117909c73e5e3a579ae4c28dce 10 years ago
Wink Saville 58ed7e4ae9 am 1f891376: am f2750dcb: am 2b549b79: Merge "Revert "Merge commit \'e887563a\' into fix-merge-conclict"" into klp-modular-dev-plus-aosp 10 years ago
Wink Saville 8836d129d1 am f13aadfb: am d1439291: Revert "Merge commit \'e887563a\' into fix-merge-conclict" 10 years ago
Jan-Willem Maarse 693df0c028 am a3ab4364: am 67ebd315: am 399cf8d6: am 1fd235cb: am 70eec2ca: am 58eb8e98: am d20f0a42: Merge "Fix NPE when clearing an extension in nano protos" 10 years ago
Bill Yi 3b3f9c919a am d0f3ba60: am 0e54db6b: am 8b5d62a4: am f4af48ae: am 9dde6a6d: am ddeaf256: Merge commit \'ba89934bdae7f4256c94a0a24992903a114e764f\' into HEAD 10 years ago
Jeff Davidson 87e6efa134 am 3656cc20: am cd8a72c7: am 7b4e8c78: am 8113c186: resolved conflicts for merge of 592b6078 to master 10 years ago
Max Cai 3b592294ac am f613f9e7: am 3af26f43: am e69eaa22: am 99c98018: am 43365182: am 829f6c01: Merge "Adds --ignore_service nano proto compiler flag" 10 years ago
Max Cai 2e66ca80c3 am 61317c32: am 90048528: am 888cafe4: am dd38a37e: am 0391f00b: am ea68d73c: Merge "Don\'t reset cachedSize to 0 in getSerializedSize" 10 years ago
Wink Saville 74848a35c0 am 6eb7a519: am 16aad88f: am 13fb32b1: am 3f1679bb: am 8a9fc09c: am ce2f5991: Merge "Revert "Don\'t reset cachedSize to 0 in getSerializedSize"" 10 years ago
Wink Saville cb06adc62f am 390b6c4b: am 291f0484: (-s ours) Merge commit \'f65ee555\' into fix-merge-conflict 10 years ago
Max Cai 34623821a6 am 55ef21bc: am a88808d4: Merge "Fix access around unknownFieldData." 10 years ago
Max Cai a476440cb4 am f39998c2: am daf63839: Merge "Keep pointers to extension values." 10 years ago
Ying Wang 6a4c81a12c am 4c8e5262: am 403cc927: am 8eed3705: You CANNOT change the global WITH_DEXPREOPT 10 years ago
Baligh Uddin e083bdfa41 am f8b1f831: am 39467629: am 6c915d3a: keep history after reset to 1fd235cbb5975e117909c73e5e3a579ae4c28dce 10 years ago
Wink Saville 39c59c2faa am f2750dcb: am 2b549b79: Merge "Revert "Merge commit \'e887563a\' into fix-merge-conclict"" into klp-modular-dev-plus-aosp 10 years ago