aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| | | * | | | | 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
* | | | | | | | Drop Python 3.3 from testing & add Python 3.5, 3.6 (#3512)cclauss2017-08-182-4/+5
* | | | | | | | Define cmp() for Python 3 (#3517)cclauss2017-08-182-1/+10
* | | | | | | | Merge pull request #3516 from cclauss/patch-3Jie Luo2017-08-186-32/+53
|\ \ \ \ \ \ \ \
| * | | | | | | | define long() for Python 3cclauss2017-08-181-5/+9
| * | | | | | | | print() function for Python 3cclauss2017-08-181-10/+14
| * | | | | | | | print() function and lose the semicolons (;)cclauss2017-08-181-4/+7
| * | | | | | | | from __future__ import print_functioncclauss2017-08-181-8/+11
| * | | | | | | | print() function & define raw_input() for Python 3cclauss2017-08-181-3/+10
| * | | | | | | | file() was removed in Python 3, use open() insteadcclauss2017-08-181-2/+2
|/ / / / / / / /
* | | | | | | | Merge pull request #3511 from cclauss/patch-3Jie Luo2017-08-171-1/+1
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / |/| | | | | | |
| * | | | | | | Old style exception --> new style exceptioncclauss2017-08-171-1/+1
|/ / / / / / /
* | | | | | | Merge pull request #3494 from drivehappy/clang_warning_macroJisi Liu2017-08-151-2/+5
|\ \ \ \ \ \ \
| * | | | | | | Fixing warning under Clang 6.x (-Wexpansion-to-defined) where the macro expan...drivehappy2017-08-151-2/+5
|/ / / / / / /
* | | | | | | Detect invalid tags with a field number of 0 in C#Jon Skeet2017-08-113-7/+16
* | | | | | | Merge pull request #3480 from bklarson/masterFeng Xiao2017-08-101-21/+14
|\ \ \ \ \ \ \
| * | | | | | | Clean up typedefs for Atomic32/Atomic64Brad Larson2017-08-101-21/+14
|/ / / / / / /
* | | | | | | Merge pull request #3473 from AlanBurlison/masterFeng Xiao2017-08-081-1/+1
|\ \ \ \ \ \ \
| * | | | | | | PROTBUF-3394 Potential SIGBUS with UnsafeUtil.getLongalanbur2017-08-081-1/+1
generated by cgit v1.2.3 (git 2.39.1) at 2024-08-27 14:34:43 +0000