aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| | * | | 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
| | | |\ \
| | | * | | Merge from masterJisi Liu2017-07-2587-1271/+3027
| | * | | | Merge pull request #3406 from ax3l/bg-3.4-cmake-pkgconfigFeng Xiao2017-07-314-0/+30
| | |\ \ \ \ | | | |/ / / | | |/| | |
| | | * | | Travis: Exclude CMake .pc filesAxel Huebl2017-07-241-0/+1
| | | * | | CMake: Install .pc FilesAxel Huebl2017-07-243-0/+29
| | * | | | Merge pull request #3413 from pherl/3.4.xJisi Liu2017-07-2524-42/+42
| | |\ \ \ \
| | | * \ \ \ Merge remote-tracking branch 'origin/3.4.x' into vbJisi Liu2017-07-243-23/+36
| | | |\ \ \ \ | | | |/ / / / | | |/| | | |
| | * | | | | Merge pull request #3414 from pherl/fixzipJisi Liu2017-07-241-22/+32
| | |\ \ \ \ \
| | | * | | | | Omit the zip test if tools are not availableJisi Liu2017-07-241-22/+32
| | * | | | | | Merge pull request #3412 from anandolee/3.4.xJisi Liu2017-07-242-1/+4
| | |\ \ \ \ \ \ | | | |/ / / / / | | |/| | | | |
| | | * | | | | Add __bool__ as well as __nonzero__ for python3Jie Luo2017-07-241-0/+3
| | | * | | | | Use keys() instead of iterkeys() to be python3 compatbile.Jie Luo2017-07-241-1/+1
| | |/ / / / /
| | | * | | | 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-2412-18/+18
| | |/ / / /
| | * | | | Merge pull request #3393 from pherl/3.4.xJisi Liu2017-07-24308-8120/+20323
| | |\ \ \ \ | | | |/ / / | | |/| | |
| | | * | | Fix code to use values() insteadJisi Liu2017-07-191-1/+1
| | | * | | Update filelist againJisi Liu2017-07-191-0/+1
| | | * | | Add lite and python extra_dist filesJisi Liu2017-07-191-0/+4
| | | * | | Add java and JS dist files.Jisi Liu2017-07-191-0/+23
| | | * | | remove broken imports in JSJisi Liu2017-07-191-2/+0
| | | * | | Use itmes() instead of itervalues() to be python3 compatbile.Jisi Liu2017-07-191-1/+1
| | | * | | Fix distcheckJisi Liu2017-07-191-0/+1
| | | * | | remove profileJisi Liu2017-07-194-2239/+0
| | | * | | update build file listJisi Liu2017-07-192-3/+1
| | | * | | Update conformance testsJisi Liu2017-07-195-1184/+6
| | | * | | Merge master into 3.4.xJisi Liu2017-07-18328-7456/+12078
| | | |\ \ \ | | | |/ / / | | |/| | |
| | | * | | Update csharp and php descriptorJisi Liu2017-07-188-188/+412
| | | * | | Merge from Google internal for 3.4 releaseJisi Liu2017-07-18272-5810/+21087
* | | | | | remove the parens from the cmp() lambda definition (#3526)cclauss2017-08-212-4/+4
|/ / / / /
* | | | | Merge pull request #3317 from ejona86/protoc-artifacts-jdk8Jisi Liu2017-08-181-2/+3
|\ \ \ \ \
| * | | | | protoc-artifacts: Bump JDK to 8u131Eric Anderson2017-07-051-2/+3
* | | | | | Revert "Drop Python 3.3 from testing & add Python 3.5, 3.6 (#3512)" (#3524)Jie Luo2017-08-182-5/+4