Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Merge remote-tracking branch 'origin/3.4.x' into master | 2017-10-25 | |
|\ | |||
* \ | Merge pull request #3787 from sergiocampama/coverage | 2017-10-24 | |
|\ \ | |||
| * | | Improves coverage of GPBCodedInputStream | 2017-10-24 | |
|/ / | |||
| * | Merge pull request #3758 from spinorx/3.4.x | 2017-10-20 | |
| |\ | |||
* | \ | Merge pull request #3757 from spinorx/master | 2017-10-20 | |
|\ \ \ | |||
* \ \ \ | Merge pull request #3743 from Schtolc/master | 2017-10-19 | |
|\ \ \ \ | |||
* \ \ \ \ | Merge pull request #3754 from toanju/gcc-fallthrough | 2017-10-19 | |
|\ \ \ \ \ | |||
* \ \ \ \ \ | Merge pull request #3770 from pherl/3.5-integrate | 2017-10-19 | |
|\ \ \ \ \ \ | |||
| * | | | | | | Fix Java 1.6 compile | 2017-10-18 | |
* | | | | | | | Merge pull request #3751 from uykusuz/master | 2017-10-18 | |
|\ \ \ \ \ \ \ | |||
| | | | | | * \ | Merge pull request #3578 from pherl/filedeprecation | 2017-10-18 | |
| | | | | | |\ \ | |||
* | | | | | | \ \ | Merge pull request #3764 from zearen/patch-1 | 2017-10-18 | |
|\ \ \ \ \ \ \ \ \ | |||
* \ \ \ \ \ \ \ \ \ | Merge pull request #3698 from hesmar/hesmar/fixProtocIncludeDirs | 2017-10-18 | |
|\ \ \ \ \ \ \ \ \ \ | |||
| | | | | | | | * \ \ | Merge pull request #3641 from drivehappy/3.4.x_clang_cleanup_3 | 2017-10-18 | |
| | | | | | | | |\ \ \ | |||
* | | | | | | | | \ \ \ | Merge pull request #3706 from johanbrandhorst/patch-1 | 2017-10-18 | |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||
| | | | | * | | | | | | | | Fix JS conformance tests | 2017-10-18 | |
| | | | | * | | | | | | | | Fix bazel build | 2017-10-18 | |
| | | | | * | | | | | | | | Update descriptor protos | 2017-10-18 | |
* | | | | | | | | | | | | | Merge pull request #3736 from jleni/fix_rbpi | 2017-10-18 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| | | | | | * \ \ \ \ \ \ \ | Merge branch 'master' of github.com:google/protobuf | 2017-10-18 | |
| | | | | | |\ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | | | | |||
| | | | | | * | | | | | | | | Merge from google internal | 2017-10-18 | |
* | | | | | | | | | | | | | | Merge pull request #3769 from pherl/io_win32 | 2017-10-18 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | | | | |||
| * | | | | | | | | | | | | | Fix unsiged underflow | 2017-10-18 | |
| * | | | | | | | | | | | | | Remove C++11 only usages in io_win32 tests. | 2017-10-18 | |
|/ / / / / / / / / / / / / | |||
* | | | | | | | | | | | | | Merge pull request #3760 from jmillikin-stripe/descriptor-memset-ub | 2017-10-16 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | | | | | Fix undefined memory management found by Clang's sanitizers. | 2017-10-16 | |
|/ / / / / / / / / / / / / | |||
| | | | | | | | | | | | * | Fix iOS cc_library build for protobuf. | 2017-10-15 | |
| | | | | | | | | | |_|/ | | | | | | | | | |/| | | |||
| | | | | | | | * / | | | Fix iOS cc_library build for protobuf. | 2017-10-15 | |
| |_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | |||
| | | | | | * | | | | | fix implicit fallthrough in gcc 7 | 2017-10-15 | |
| |_|_|_|_|/ / / / / |/| | | | | | | | | | |||
| | | | | * | | | | | fixes issue #3750 | 2017-10-14 | |
| |_|_|_|/ / / / / |/| | | | | | | | | |||
* | | | | | | | | | Merge pull request #3744 from fmarier/json-escaping-namespace | 2017-10-13 | |
|\ \ \ \ \ \ \ \ \ | |||
| * | | | | | | | | | Move namespace closing brace inside the header guard block | 2017-10-12 | |
|/ / / / / / / / / | |||
* | | | | | | | | | Merge pull request #3739 from pherl/merge3.4 | 2017-10-12 | |
|\ \ \ \ \ \ \ \ \ | |||
| | | | | | * | | | | CodedInputStream::SetTotalBytesLimit description fix | 2017-10-12 | |
| |_|_|_|_|/ / / / |/| | | | | | | | | |||
| * | | | | | | | | Fix distcheck | 2017-10-11 | |
| * | | | | | | | | Merge remote-tracking branch 'origin/3.4.x' into master | 2017-10-11 | |
|/| | | | | | | | | | |_|_|_|/ / / | |/| | | | | | | |||
| | * | | | | | | Converting to immutable hashable types | 2017-10-11 | |
| |/ / / / / / |/| | | | | | | |||
* | | | | | | | Merge pull request #3735 from sgreenstein/patch-1 | 2017-10-10 | |
|\ \ \ \ \ \ \ | |||
| * | | | | | | | Don't pass -lpthread and -lm on Windows | 2017-10-10 | |
|/ / / / / / / | |||
* | | | | | | | Reserve unknown fields in php (#3659) | 2017-10-09 | |
| | | | * | | | Update third_party.md | 2017-10-09 | |
| |_|_|/ / / |/| | | | | | |||
* | | | | | | Add well known types to php runtime. (#3697) | 2017-10-05 | |
* | | | | | | Fix ruby segment fault (#3708) | 2017-10-03 | |
* | | | | | | Merge pull request #3714 from thomasvl/objc_increase_test_coverage | 2017-10-03 | |
|\ \ \ \ \ \ | |||
| * | | | | | | Build out more complete code coverage in the tests. | 2017-10-03 | |
| * | | | | | | Let Xcode 9 update project/scheme settings. | 2017-10-03 | |
|/ / / / / / | |||
* | | | | | | Merge pull request #3710 from thomasvl/xcode9 | 2017-10-02 | |
|\ \ \ \ \ \ | |||
* \ \ \ \ \ \ | Merge pull request #3709 from thomasvl/unknown_field_merge_issue | 2017-10-02 | |
|\ \ \ \ \ \ \ | |||
| | * | | | | | | Add Xcode 9 support to the helper script. | 2017-10-02 | |
| |/ / / / / / |/| | | | | | | |||
| * | | | | | | ObjC: Fix merging of length delimited unknown fields. | 2017-10-02 | |
|/ / / / / / |