aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* am f091cdfb: am aa2e7e5f: am 3a2460f3: am f3bf0583: am 662d2f44: am adfb09a0:...Wink Saville2015-03-200-0/+0
|\
| * am aa2e7e5f: am 3a2460f3: am f3bf0583: am 662d2f44: am adfb09a0: am 7632e0ad:...Wink Saville2014-08-210-0/+0
| |\
* | \ am 5e93722a: am ed67cd79: am d801ea90: am 2fb1789c: am 66a4ccc4: am df9a6dff:...Wink Saville2015-03-200-0/+0
|\ \ \ | |/ /
| * | am ed67cd79: am d801ea90: am 2fb1789c: am 66a4ccc4: am df9a6dff: am 48ee66d2:...Wink Saville2014-08-210-0/+0
| |\ \
* | \ \ am 42f3fd77: am 1c524da8: am 9f4f73e2: am 50ddd7ad: am 7022c115: am ba363f13:...Wink Saville2015-03-200-0/+0
|\ \ \ \ | |/ / /
| * | | am 1c524da8: am 9f4f73e2: am 50ddd7ad: am 7022c115: am ba363f13: am a38aedb3:...Wink Saville2014-08-210-0/+0
| |\ \ \
* | \ \ \ am a55aae90: am 3c00157e: am 02cba9f2: am 05f45faa: am efa53b19: am 4d7f9ad7:...Wink Saville2015-03-200-0/+0
|\ \ \ \ \ | |/ / / /
| * | | | am 3c00157e: am 02cba9f2: am 05f45faa: am efa53b19: am 4d7f9ad7: am ece98e5f:...Wink Saville2014-08-210-0/+0
| |\ \ \ \
* | \ \ \ \ am 1978393d: am a94fe6cb: am 7a8797ab: am 77140fb2: am 211bb912: am f105476a:...Wink Saville2015-03-200-0/+0
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am a94fe6cb: am 7a8797ab: am 77140fb2: am 211bb912: am f105476a: am e7b778b9:...Wink Saville2014-08-210-0/+0
| |\ \ \ \ \
* | \ \ \ \ \ am 0f36c619: am b09fd32d: am f25e1e6b: am 165d4d7e: am bf6d9ec1: am 94f522f9:...Ying Wang2015-03-200-0/+0
|\ \ \ \ \ \ \ | |/ / / / / /
| * | | | | | am b09fd32d: am f25e1e6b: am 165d4d7e: am bf6d9ec1: am 94f522f9: am 49512cb0:...Ying Wang2014-08-210-0/+0
| |\ \ \ \ \ \
* | \ \ \ \ \ \ am 682363bc: am a76831c3: Merge "Fix how getRepeatedFieldArrayLength works"Max Cai2015-03-201-5/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am a76831c3: Merge "Fix how getRepeatedFieldArrayLength works"Max Cai2014-08-071-5/+1
| |\ \ \ \ \ \ \
| | * \ \ \ \ \ \ Merge "Fix how getRepeatedFieldArrayLength works"Max Cai2014-08-051-5/+1
| | |\ \ \ \ \ \ \
| | | * | | | | | | Fix how getRepeatedFieldArrayLength worksMax Cai2014-07-031-5/+1
* | | | | | | | | | am d3518087: am f91b7fa1: Fix build, by using external/zlib instead of system...Sam Hasinoff2015-03-200-0/+0
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | am f91b7fa1: Fix build, by using external/zlib instead of system zlibSam Hasinoff2014-08-050-0/+0
| |\ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ am 3c1dbbae: am 4d11e705: Merge "Fix the aprotoc target for Windows."Leandro Gracia Gil2015-03-202-1/+4
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | am 4d11e705: Merge "Fix the aprotoc target for Windows."Leandro Gracia Gil2014-07-312-1/+5
| |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / | | |/| | | | | | | |
| | * | | | | | | | | Merge "Fix the aprotoc target for Windows."Leandro Gracia Gil2014-07-292-1/+5
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | Fix the aprotoc target for Windows.Leandro Gracia Gil2014-07-282-1/+5
| | |/ / / / / / / / /
* | | | | | | | | | | am f9b409e3: am 95d99df4: Merge "Don\'t return NULL from {Boxed}PrimitiveType...Brian Duff2015-03-201-4/+4
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | am 95d99df4: Merge "Don\'t return NULL from {Boxed}PrimitiveTypeName."Brian Duff2014-07-221-4/+4
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / /
| | * | | | | | | | | Merge "Don't return NULL from {Boxed}PrimitiveTypeName."Brian Duff2014-07-211-4/+4
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | Don't return NULL from {Boxed}PrimitiveTypeName.Brian Duff2014-07-211-4/+4
| | |/ / / / / / / / /
* | | | | | | | | | | am 60b72a8e: am 11607eb1: Merge "Add a hasExtension method to ExtendableMessa...Max Cai2015-03-202-2/+69
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | am 11607eb1: Merge "Add a hasExtension method to ExtendableMessageNano."Max Cai2014-07-182-2/+69
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / /
| | * | | | | | | | | Merge "Add a hasExtension method to ExtendableMessageNano."Max Cai2014-07-172-2/+69
| | |\ \ \ \ \ \ \ \ \
| | | * | | | | | | | | Add a hasExtension method to ExtendableMessageNano.Juan Silveira2014-07-172-2/+69
| | |/ / / / / / / / /
* | | | | | | | | | | am ecb2c88b: am 55ef21bc: am a88808d4: Merge "Fix access around unknownFieldD...Max Cai2014-08-217-16/+36
|\ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ am 55ef21bc: am a88808d4: Merge "Fix access around unknownFieldData."Max Cai2014-08-217-16/+36
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / /
| | * | | | | | | | | | am a88808d4: Merge "Fix access around unknownFieldData."Max Cai2014-07-157-16/+36
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / /
| | | * | | | | | | | | Merge "Fix access around unknownFieldData."Max Cai2014-07-147-16/+36
| | | |\ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | Fix access around unknownFieldData.Max Cai2014-07-157-16/+36
| | | |/ / / / / / / / /
* | | | | | | | | | | | am 2e6d4ae0: am f39998c2: am daf63839: Merge "Keep pointers to extension valu...Max Cai2014-08-218-256/+920
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | am f39998c2: am daf63839: Merge "Keep pointers to extension values."Max Cai2014-08-218-256/+920
| |\ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / /
| | * | | | | | | | | | am daf63839: Merge "Keep pointers to extension values."Max Cai2014-07-158-256/+920
| | |\ \ \ \ \ \ \ \ \ \ | | | |/ / / / / / / / /
| | | * | | | | | | | | Merge "Keep pointers to extension values."Max Cai2014-07-148-256/+920
| | | |\ \ \ \ \ \ \ \ \ | | | | |_|/ / / / / / / | | | |/| | | | | | | |
| | | | * | | | | | | | Keep pointers to extension values.Juan Silveira2014-07-148-256/+920
| | | |/ / / / / / / /
* | | | | | | | | | | am cca3823d: am 4c8e5262: am 403cc927: am 8eed3705: You CANNOT change the glo...Ying Wang2014-08-210-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | am 4c8e5262: am 403cc927: am 8eed3705: You CANNOT change the global WITH_DEXP...Ying Wang2014-08-210-0/+0
| |\ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / /
* | | | | | | | | | | am 57e2ee78: am f8b1f831: am 39467629: am 6c915d3a: keep history after reset ...Baligh Uddin2014-08-210-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | am f8b1f831: am 39467629: am 6c915d3a: keep history after reset to 1fd235cbb5...Baligh Uddin2014-08-210-0/+0
| |\ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ am 1f891376: am f2750dcb: am 2b549b79: Merge "Revert "Merge commit \'e887563a...Wink Saville2014-08-210-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | am f2750dcb: am 2b549b79: Merge "Revert "Merge commit \'e887563a\' into fix-m...Wink Saville2014-08-210-0/+0
| |\ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ am f13aadfb: am d1439291: Revert "Merge commit \'e887563a\' into fix-merge-co...Wink Saville2014-08-210-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | am d1439291: Revert "Merge commit \'e887563a\' into fix-merge-conclict"Wink Saville2014-08-210-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ am a3ab4364: am 67ebd315: am 399cf8d6: am 1fd235cb: am 70eec2ca: am 58eb8e98:...Jan-Willem Maarse2014-08-210-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | am 67ebd315: am 399cf8d6: am 1fd235cb: am 70eec2ca: am 58eb8e98: am d20f0a42:...Jan-Willem Maarse2014-08-210-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \