Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #4291 from google/3.5.x | Jisi Liu | 2018-02-26 | 12 | -61/+189 |
|\ | |||||
| * | Merge pull request #4236 from pherl/3.5.x | Jisi Liu | 2018-01-26 | 1 | -1/+1 |
| |\ | |||||
| | * | Bumping number to fix ruby 2.1 on mac | Jisi Liu | 2018-01-26 | 1 | -1/+1 |
| * | | Fix more memory leak for php c extension (#4211) | Paul Yang | 2018-01-25 | 7 | -27/+117 |
| |/ | |||||
| * | Merge pull request #4185 from pherl/ruby2.5 | Jisi Liu | 2018-01-17 | 1 | -2/+2 |
| |\ | |||||
| | * | Update rake file to build of 2.1.6. | Jisi Liu | 2018-01-17 | 1 | -2/+2 |
| * | | Merge pull request #4182 from pherl/ruby2.5 | Jisi Liu | 2018-01-17 | 2 | -3/+3 |
| |\| | |||||
| | * | Support ruby2.5 | Jisi Liu | 2018-01-17 | 2 | -3/+3 |
| * | | Well known types are not initialized properly. (#4139) | Paul Yang | 2018-01-05 | 3 | -30/+68 |
| * | | Merge pull request #4146 from pherl/fix_protoc | Jisi Liu | 2018-01-05 | 1 | -1/+1 |
| |\ \ | |||||
| | * | | Bump protoc-artifact version for a patch rebuild | Jisi Liu | 2018-01-05 | 1 | -1/+1 |
| | |/ | |||||
* | | | Merge pull request #4324 from abdul-sami/master | Feng Xiao | 2018-02-22 | 1 | -0/+5 |
|\ \ \ | |||||
| * | | | Merge pull request #1 from abdul-sami/abdul-sami-patch-1 | Abdul Sami | 2018-02-21 | 1 | -0/+5 |
|/| | | | |||||
| * | | | Added instruction for existing ZLIB configuration | Abdul Sami | 2018-02-21 | 1 | -0/+5 |
|/ / / | |||||
* | | | Merge pull request #4323 from dtapuska/master | Feng Xiao | 2018-02-20 | 1 | -2/+2 |
|\ \ \ | |||||
| * | | | Rename a shadowed variable. | Dave Tapuska | 2018-02-20 | 1 | -2/+2 |
* | | | | Merge pull request #3186 from gkelly/remove-unused-variable | Feng Xiao | 2018-02-20 | 1 | -2/+0 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | Remove unused output_file variable from js_embed | Garret Kelly | 2017-06-05 | 1 | -2/+0 |
* | | | | Only check filenames when end with .py in _CalledFromGeneratedFile() (#4262) | Jie Luo | 2018-02-09 | 1 | -4/+9 |
* | | | | Merge pull request #4302 from BSBandme/down_integ_benchmark | Yilun Chong | 2018-02-09 | 17 | -30/+89 |
|\ \ \ \ | |||||
| * | | | | Sync internal benchmark changes | Yilun Chong | 2018-02-09 | 17 | -30/+89 |
* | | | | | Remove stray indent on normal imports. | Thomas Van Lenten | 2018-02-08 | 1 | -2/+2 |
* | | | | | Merge pull request #4288 from nico/nofall | Feng Xiao | 2018-02-08 | 2 | -16/+1 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||||
| * | | | | Remove use of GOOGLE_FALLTHROUGH_INTENDED from protobuf. | Nico Weber | 2018-02-07 | 2 | -16/+1 |
* | | | | | Fix up the docs to mention the WKTs generated files also. | Thomas Van Lenten | 2018-02-07 | 1 | -4/+6 |
|/ / / / | |||||
* | | | | Merge pull request #4259 from Mizux/master | Feng Xiao | 2018-02-02 | 5 | -5/+12 |
|\ \ \ \ | |||||
| * | | | | Use NEW behaviour for project VERSION variables. | Corentin Le Molgat | 2018-02-01 | 1 | -0/+4 |
| * | | | | Even with MSVC enable zlib support as default behaviour. | Corentin Le Molgat | 2018-02-01 | 1 | -5/+1 |
| * | | | | Add CMake ALIAS targets | Corentin Le Molgat | 2018-02-01 | 4 | -0/+4 |
| * | | | | Add VERSION property to CMake library targets | Corentin Le Molgat | 2018-02-01 | 3 | -0/+3 |
* | | | | | Merge pull request #4257 from davido/support_java9 | Feng Xiao | 2018-02-01 | 1 | -1/+15 |
|\ \ \ \ \ | |||||
| * | | | | | Bazel: Support building with Java 9 | David Ostrovsky | 2018-01-31 | 1 | -1/+15 |
* | | | | | | Merge pull request #4265 from BSBandme/upgrade_benchmark_submodule | Yilun Chong | 2018-02-01 | 2 | -1/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | upgrade submodule | Yilun Chong | 2018-02-01 | 2 | -1/+1 |
* | | | | | | | Merge pull request #4266 from brunokim/patch-1 | Jisi Liu | 2018-02-01 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | |||||
| * | | | | | | Fix link markup in third party list. | Bruno Kim Medeiros Cesar | 2018-02-01 | 1 | -1/+1 |
|/ / / / / / | |||||
* | | | | | | Merge pull request #4239 from mrpi/master | Adam Cozzette | 2018-01-31 | 1 | -4/+2 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Fix -fpermissive: '<::' cannot begin a template-argument list | Ludger Sprenker | 2018-01-30 | 1 | -1/+1 |
| * | | | | | | Create std::string in Arena memory | Ludger Sprenker | 2018-01-24 | 1 | -4/+2 |
* | | | | | | | Work around strange error with atomic and swift under Xcode 8.3.3. | Thomas Van Lenten | 2018-01-31 | 3 | -42/+42 |
* | | | | | | | Don't assume c-strings are 4 byte aligned. | Thomas Van Lenten | 2018-01-31 | 1 | -2/+4 |
* | | | | | | | Fix to use "nil" instead of "NULL" for objc objects. | Thomas Van Lenten | 2018-01-31 | 3 | -5/+5 |
* | | | | | | | Work around the static analyzer false report. | Thomas Van Lenten | 2018-01-31 | 1 | -0/+6 |
* | | | | | | | Add casts to removed undefined behaviors around shifts. | Thomas Van Lenten | 2018-01-31 | 6 | -11/+11 |
| |/ / / / / |/| | | | | | |||||
* | | | | | | Merge pull request #4249 from nlochschmidt/patch-1 | Feng Xiao | 2018-01-30 | 1 | -0/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Propose kotlinx.serialization as 3rd party lib | Niklas Lochschmidt | 2018-01-30 | 1 | -0/+1 |
* | | | | | | | Move kokoro macOS builds to to Xcode 9.1. | Thomas Van Lenten | 2018-01-30 | 1 | -1/+1 |
|/ / / / / / | |||||
* | | | | | | Merge pull request #3825 from ras0219-msft/patch-1 | Jisi Liu | 2018-01-29 | 1 | -0/+10 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Add Vcpkg to C++ installation instructions for Windows | Robert Schumacher | 2018-01-29 | 1 | -0/+10 |
|/ / / / / / | |||||
* | | | | | | Merge pull request #4196 from mathstuf/cmake-private-target-sources | Adam Cozzette | 2018-01-29 | 1 | -1/+1 |
|\ \ \ \ \ \ |