aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
| |\ \ \ \ \ \
* | \ \ \ \ \ \ am d0f3ba60: am 0e54db6b: am 8b5d62a4: am f4af48ae: am 9dde6a6d: am ddeaf256:...Bill Yi2014-08-210-0/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / /
| * | | | | | | am 0e54db6b: am 8b5d62a4: am f4af48ae: am 9dde6a6d: am ddeaf256: Merge commit...Bill Yi2014-08-210-0/+0
| |\ \ \ \ \ \ \
* | \ \ \ \ \ \ \ am 3656cc20: am cd8a72c7: am 7b4e8c78: am 8113c186: resolved conflicts for me...Jeff Davidson2014-08-210-0/+0
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / /
| * | | | | | | | am cd8a72c7: am 7b4e8c78: am 8113c186: resolved conflicts for merge of 592b60...Jeff Davidson2014-08-210-0/+0
| |\ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ am f613f9e7: am 3af26f43: am e69eaa22: am 99c98018: am 43365182: am 829f6c01:...Max Cai2014-08-210-0/+0
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / /
| * | | | | | | | | am 3af26f43: am e69eaa22: am 99c98018: am 43365182: am 829f6c01: Merge "Adds ...Max Cai2014-08-210-0/+0
| |\ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ am 61317c32: am 90048528: am 888cafe4: am dd38a37e: am 0391f00b: am ea68d73c:...Max Cai2014-08-210-0/+0
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / /
| * | | | | | | | | | am 90048528: am 888cafe4: am dd38a37e: am 0391f00b: am ea68d73c: Merge "Don\'...Max Cai2014-08-210-0/+0
| |\ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ am 6eb7a519: am 16aad88f: am 13fb32b1: am 3f1679bb: am 8a9fc09c: am ce2f5991:...Wink Saville2014-08-210-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / /
| * | | | | | | | | | | am 16aad88f: am 13fb32b1: am 3f1679bb: am 8a9fc09c: am ce2f5991: Merge "Rever...Wink Saville2014-08-210-0/+0
| |\ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ am 390b6c4b: am 291f0484: (-s ours) Merge commit \'f65ee555\' into fix-merge-...Wink Saville2014-08-210-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / /
| * | | | | | | | | | | | am 291f0484: (-s ours) Merge commit \'f65ee555\' into fix-merge-conflictWink Saville2014-08-210-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ am 232698c4: am de6420aa: am d89b3060: am f213b0c6: am 5b931dc7: am ec0b12c3:...Wink Saville2014-08-200-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / /
| * | | | | | | | | | | | | am de6420aa: am d89b3060: am f213b0c6: am 5b931dc7: am ec0b12c3: Merge "Don\'...Wink Saville2014-08-200-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ \ am 0cb1a2f6: am c8f69926: am 27243737: am 1a4b1d52: am 00310299: am 51ef8f39:...Wink Saville2014-08-200-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / /
| * | | | | | | | | | | | | | am c8f69926: am 27243737: am 1a4b1d52: am 00310299: am 51ef8f39: Merge "Fix c...Wink Saville2014-08-200-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 67584f49: am 9de52973: am e8f7a71c: am 9141054b: am 214997ce: am afc1553a:...Max Cai2014-08-200-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | am 9de52973: am e8f7a71c: am 9141054b: am 214997ce: am afc1553a: Merge "Exten...Max Cai2014-08-200-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 1b9cb7b2: am 0eaea6a8: am 286f5705: am 5c3544dd: am 5d33d23d: am 447f664a:...Max Cai2014-08-200-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | am 0eaea6a8: am 286f5705: am 5c3544dd: am 5d33d23d: am 447f664a: Merge change...Max Cai2014-08-200-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ am 1af058a5: am 0ce2c261: am c7a7b2ac: resolved conflicts for merge of 6965d8...Jie Dai2014-08-200-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | am 0ce2c261: am c7a7b2ac: resolved conflicts for merge of 6965d891 to klp-mod...Jie Dai2014-08-200-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \