aboutsummaryrefslogtreecommitdiff
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into 3.4.xBo Yang2017-08-052-0/+2
|\
| * Add a objc_class_prefix to test_messages_proto3.proto.Thomas Van Lenten2017-07-261-0/+1
| * Merge pull request #3410 from adam-26/1745Adam Cozzette2017-07-251-0/+1
| |\
| | * Fix quotation marksAdam2017-07-241-1/+1
| | * Fix issue #1745 - javascript allow dot in filenameAdam2017-07-241-0/+1
* | | Fix invalid offsetof warning.Jisi Liu2017-08-0315-144/+315
* | | Add destructors for default instances to the shutdown code.Gerben Stavenga2017-08-0216-73/+152
* | | Adding the missing headerJisi Liu2017-08-011-0/+1
* | | Export functions in io_win32.h in win DLL buildJisi Liu2017-08-011-13/+14
* | | Fix makefile.amJisi Liu2017-07-251-0/+3
* | | Fix build filesJisi Liu2017-07-251-0/+3
* | | Merge remote-tracking branch 'origin/master' into mergeJisi Liu2017-07-252-2/+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
| * | | Merge pull request #3281 from BSBandme/ConformanceTestYilunChongYilun Chong2017-07-242-3/+219
| |\ \ \ | | |_|/ | |/| |
| | * | Merge branch 'master' into ConformanceTestYilunChongYilun Chong2017-06-3040-819/+968
| | |\ \
| | * | | add some test proto2 supported, add js proto2 supported, fixed some errorYilun Chong2017-06-302-4/+4
| | * | | change php objc nodejs csharp rubyYilun Chong2017-06-291-7/+7
| | * | | add message set test caseYilun Chong2017-06-281-0/+20
| | * | | add support for proto2Yilun Chong2017-06-261-4/+4
| | * | | add test_proto2_message.proto and change conformnace/makefile.amYilun Chong2017-06-231-0/+196
| * | | | Merge pull request #2969 from laszlocsomor/masterFeng Xiao2017-07-2414-81/+950
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Windows: support long pathsLaszlo Csomor2017-07-1114-81/+950
| * | | | Fixed dynamic initialization for C++ liteAdam Cozzette2017-07-1915-75/+26
| * | | | Merge pull request #3375 from TeBoring/3.3.xPaul Yang2017-07-1934-23/+98
| |\ \ \ \
| | * \ \ \ Merge 3.3.x into masterBo Yang2017-07-1834-23/+98
| | |\ \ \ \
| | | * | | | Update C++ generated code.Bo Yang2017-06-2113-13/+13
| | | * | | | Update version number to 3.3.2Bo Yang2017-06-212-4/+4
| | | * | | | Add ARRAY for reserved name (#3150)Paul Yang2017-06-201-2/+2
| | | * | | | regenerate plugin and profile message codeSteven Peters2017-05-112-0/+4
| | | * | | | Use bool deterministic to suppress warningSteven Peters2017-05-1113-0/+55
| | | * | | | Update C++ generated code.Feng Xiao2017-05-0813-13/+13
| | | * | | | Update version number to 3.3.1Feng Xiao2017-05-082-4/+4
| | | * | | | Merge pull request #3073 from xfxyjwf/3.3.xFeng Xiao2017-05-081-1/+2
| | | |\ \ \ \
| | | | * | | | Workaround gcc < 4.5.0 bugMario J. Rugiero2017-05-081-1/+2
| | | * | | | | Fix compilationrandomguy32017-05-061-1/+1
| | | * | | | | Fix offset type to match the tables it is used inAlex Merry2017-05-051-1/+1
| | | |/ / / /
| | | * | | | Add missing LIBRPOTOC_EXPORT.Feng Xiao2017-05-041-2/+2
| | | * | | | Skip C# test in C++ only distribution.Feng Xiao2017-05-041-0/+8
| | | * | | | Add missing files to build files.Feng Xiao2017-05-042-3/+4
| | | * | | | Fix issue 3046: compilation on alpine 3.5Chris Nix2017-05-041-0/+7
* | | | | | | Merge from masterJisi Liu2017-07-2533-89/+1276
* | | | | | | Merge remote-tracking branch 'origin/3.4.x' into vbJisi Liu2017-07-241-22/+32
|\ \ \ \ \ \ \
| * | | | | | | Omit the zip test if tools are not availableJisi Liu2017-07-241-22/+32
* | | | | | | | Update required version on pre-generated filesJisi Liu2017-07-2412-12/+12
* | | | | | | | Update pre generated filesJisi Liu2017-07-2412-12/+12
* | | | | | | | Update version number for 3.4.0Jisi Liu2017-07-242-8/+8
|/ / / / / / /
* | | | | | | Fix distcheckJisi Liu2017-07-191-0/+1
* | | | | | | remove profileJisi Liu2017-07-193-2238/+0