aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #3450 from pherl/invalidoffsetJisi Liu2017-08-0315-144/+315
|\
| * Fix invalid offsetof warning.Jisi Liu2017-08-0315-144/+315
* | Merge pull request #3451 from pherl/fixtypoJisi Liu2017-08-031-1/+1
|\ \ | |/ |/|
| * Fix typo.Jisi Liu2017-08-031-1/+1
|/
* Add destructors for default instances to the shutdown code.Gerben Stavenga2017-08-0216-73/+152
* Merge pull request #3442 from pherl/csharpversionJisi Liu2017-08-021-1/+1
|\
| * Bump csharp versionJisi Liu2017-08-021-1/+1
* | Merge pull request #3438 from pherl/changelogJisi Liu2017-08-021-0/+128
|\|
| * Update change logJisi Liu2017-08-011-0/+128
* | Merge pull request #3419 from pherl/3.4.xJisi Liu2017-08-0185-1295/+3022
|\|
| * remove the duplicationJisi Liu2017-08-011-1/+0
| * Adding the missing headerJisi Liu2017-08-011-0/+1
| * Export functions in io_win32.h in win DLL buildJisi Liu2017-08-011-13/+14
| * Update conformance tests again.Jisi Liu2017-07-253-3/+4
| * Fix makefile.amJisi Liu2017-07-253-0/+5
| * Fix conformance testsJisi Liu2017-07-252-4/+4
| * Fix build filesJisi Liu2017-07-255-7/+3
| * Remove dependency on guava 20Jisi Liu2017-07-252-14/+10
| * Update conformance testsJisi Liu2017-07-253-5/+6
| * Merge remote-tracking branch 'origin/master' into mergeJisi Liu2017-07-252-2/+3
| |\
| | * need for php math functions. used in mergeFromJsonString (#3409)Sergey2017-07-251-0/+3
| | * Merge pull request #3407 from bklarson/masterAdam Cozzette2017-07-2515-1/+29
| | |\
| | | * Put AddDescriptorsImpl() in anonymous namespaceBrad Larson2017-07-2414-0/+28
| | | * Add -Werror=missing-declarations to test buildsBrad Larson2017-07-241-1/+1
| | * | Fix cycle dependency for repeated field not collected by gc (#3399)Paul Yang2017-07-258-64/+243
| | * | Merge pull request #3281 from BSBandme/ConformanceTestYilunChongYilun Chong2017-07-2427-1073/+1523
| | |\ \
| | | * | add comments in makefile.amYilun Chong2017-07-051-1/+2
| | | * | change csharp failure listYilun Chong2017-07-051-4/+1
| | | * | Merge branch 'ConformanceTestYilunChong' of github.com:BSBandme/protobuf into...Yilun Chong2017-07-05113-3446/+5297
| | | |\ \
| | | | * \ Merge branch 'master' into ConformanceTestYilunChongYilun Chong2017-06-30113-3446/+5297
| | | | |\ \
| | | * | | | delete backup filesYilun Chong2017-07-051-155/+0
| | | * | | | fix php failing list and csharp generated protoYilun Chong2017-07-054-213/+370
| | | |/ / /
| | | * | | changed php's failing listYilun Chong2017-06-302-534/+11
| | | * | | remove backup filesYilun Chong2017-06-303-438/+0
| | | * | | add some test proto2 supported, add js proto2 supported, fixed some errorYilun Chong2017-06-3025-1230/+1742
| | | * | | change php objc nodejs csharp rubyYilun Chong2017-06-296-31/+30
| | | * | | change java to uniform message, revert TestValidDataForType's parametersYilun Chong2017-06-293-318/+147
| | | * | | change cpp and python to uniform messageYilun Chong2017-06-293-102/+67
| | | * | | fix csharp conformance testYilun Chong2017-06-281-1/+1
| | | * | | fix csharp conformance testYilun Chong2017-06-281-16/+16
| | | * | | fix csharpYilun Chong2017-06-281-15/+15
| | | * | | add csharp supportYilun Chong2017-06-282-12/+57
| | | * | | add message set test caseYilun Chong2017-06-282-0/+21
| | | * | | add objec supportYilun Chong2017-06-281-6/+14
| | | * | | revert ruby proto built filesYilun Chong2017-06-2812-396/+0
| | | * | | delete backup filesYilun Chong2017-06-283-385/+0
| | | * | | delete binaryYilun Chong2017-06-2810-0/+0
| | | * | | update .gitignoreYilun Chong2017-06-281-0/+1
| | | * | | revert .gitignoreYilun Chong2017-06-281-1/+0
| | | * | | add java supportedYilun Chong2017-06-2811-17/+184