aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| | | * | | 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
* | | | | | | Merge pull request #3467 from thomasvl/bump_xcode_versionThomas Van Lenten2017-08-082-4/+2
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Move travis to the Xcode 8.3 (8.3.3) image.Thomas Van Lenten2017-08-071-1/+1
| * | | | | | Fix up Xcode 8.3.x support.Thomas Van Lenten2017-08-071-3/+1
* | | | | | | Merge pull request #3454 from anandolee/masterJie Luo2017-08-074-8/+16
|\ \ \ \ \ \ \
| * | | | | | | PY26 tests compatibilityJie Luo2017-08-042-4/+12
| * | | | | | | Skip setUpClass which is newly added in python2.7 for python2.6Jie Luo2017-08-041-2/+3
| * | | | | | | Add python 2.6 test back for cpp implementation. Json format issue was fixed ...Jie Luo2017-08-031-2/+1
* | | | | | | | Merge pull request #3465 from vladmos/list_plus_equalsFeng Xiao2017-08-071-3/+3
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | |
| * | | | | | | Make .bzl files compatible with future versions of BazelVladimir Moskva2017-08-071-3/+3
|/ / / / / / /
* | | | | | | Update commit id in Dockerfile to reflect change in #3391 (#3459)Paul Yang2017-08-042-2/+2
* | | | | | | Fix the bug in php c extension that setting one field can change anotherĀ fie...Paul Yang2017-08-047-33/+95
* | | | | | | Update PHP descriptors (#3391)michaelbausor2017-08-0417-21/+617
* | | | | | | Merge pull request #3456 from giorgioazzinnaro/patch-1Feng Xiao2017-08-041-0/+1
|\ \ \ \ \ \ \
| * | | | | | | Update third party addons with ProfaneDBGiorgio Azzinnaro2017-08-041-0/+1
|/ / / / / / /
* | | | | | | Add getClass for php Descriptor in c extension (#3443)Paul Yang2017-08-023-1/+16
* | | | | | | Fixing HHVM Compatibility (#3437)Ryan Gordon2017-08-021-4/+2