aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/3.4.x' into masterJisi Liu2017-10-253-2/+7
|\
| * Merge pull request #3758 from spinorx/3.4.xJisi Liu2017-10-201-43/+2
| |\
| | * Fix iOS cc_library build for protobuf.Param Reddy2017-10-151-43/+2
| * | Merge pull request #3578 from pherl/filedeprecationJisi Liu2017-10-184-2/+45
| |\ \
| | * | Add TODOJisi Liu2017-08-311-0/+3
| | * | Fix dist checkJisi Liu2017-08-311-0/+1
| | * | Add @Deprecated annotation support for proto file.Jisi Liu2017-08-313-2/+41
| * | | Merge pull request #3641 from drivehappy/3.4.x_clang_cleanup_3Jisi Liu2017-10-181-1/+1
| |\ \ \ | | |_|/ | |/| |
| | * | Clang warning cleanup for unused parameter.drivehappy2017-09-141-1/+1
* | | | Merge pull request #3787 from sergiocampama/coverageThomas Van Lenten2017-10-245-85/+182
|\ \ \ \
| * | | | Improves coverage of GPBCodedInputStreamSergio Campama2017-10-245-85/+182
|/ / / /
* | | | Merge pull request #3757 from spinorx/masterJisi Liu2017-10-201-43/+2
|\ \ \ \
| * | | | Fix iOS cc_library build for protobuf.Param Reddy2017-10-151-43/+2
* | | | | Merge pull request #3743 from Schtolc/masterJisi Liu2017-10-191-3/+3
|\ \ \ \ \
| * | | | | CodedInputStream::SetTotalBytesLimit description fixPavel2017-10-121-3/+3
* | | | | | Merge pull request #3754 from toanju/gcc-fallthroughJisi Liu2017-10-191-0/+2
|\ \ \ \ \ \
| * | | | | | fix implicit fallthrough in gcc 7Tobias Jungel2017-10-151-0/+2
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #3770 from pherl/3.5-integrateJisi Liu2017-10-19114-3115/+3684
|\ \ \ \ \ \
| * | | | | | Fix Java 1.6 compileJisi Liu2017-10-181-2/+2
| * | | | | | Fix JS conformance testsJisi Liu2017-10-181-6/+0
| * | | | | | Fix bazel buildJisi Liu2017-10-182-4/+3
| * | | | | | Update descriptor protosJisi Liu2017-10-184-4/+20
| * | | | | | Merge branch 'master' of github.com:google/protobufJisi Liu2017-10-181-13/+21
| |\ \ \ \ \ \
| * | | | | | | Merge from google internalJisi Liu2017-10-18107-3101/+3661
* | | | | | | | Merge pull request #3751 from uykusuz/masterJisi Liu2017-10-181-0/+4
|\ \ \ \ \ \ \ \
| * | | | | | | | fixes issue #3750Boris Broenner2017-10-141-0/+4
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge pull request #3764 from zearen/patch-1Jisi Liu2017-10-181-0/+1
|\ \ \ \ \ \ \ \
| * | | | | | | | Update third_party.mdZearen Wover2017-10-091-0/+1
* | | | | | | | | Merge pull request #3698 from hesmar/hesmar/fixProtocIncludeDirsJisi Liu2017-10-181-15/+15
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | protobuf_generate: create include path only for proto filesMarkus Heß2017-09-291-15/+15
* | | | | | | | | | Merge pull request #3706 from johanbrandhorst/patch-1Jisi Liu2017-10-181-0/+2
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Add GopherJS protobuf and gRPC linksJohan Brandhorst2017-10-021-0/+2
| |/ / / / / / / / /
* | | | | | | | | | Merge pull request #3736 from jleni/fix_rbpiJisi Liu2017-10-182-2/+2
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / |/| | | | | | | | |
| * | | | | | | | | Converting to immutable hashable typesJuan Leni2017-10-112-2/+2
| | |_|_|_|/ / / / | |/| | | | | | |
* | | | | | | | | Merge pull request #3769 from pherl/io_win32Jisi Liu2017-10-181-13/+21
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / |/| | | | | | | |
| * | | | | | | | Fix unsiged underflowJisi Liu2017-10-181-1/+1
| * | | | | | | | Remove C++11 only usages in io_win32 tests.Jisi Liu2017-10-181-13/+21
|/ / / / / / / /
* | | | | | | | Merge pull request #3760 from jmillikin-stripe/descriptor-memset-ubFeng Xiao2017-10-164-10/+16
|\ \ \ \ \ \ \ \ | |_|_|_|/ / / / |/| | | | | | |
| * | | | | | | Fix undefined memory management found by Clang's sanitizers.John Millikin2017-10-164-10/+16
|/ / / / / / /
* | | | | | | Merge pull request #3744 from fmarier/json-escaping-namespaceJisi Liu2017-10-131-1/+1
|\ \ \ \ \ \ \
| * | | | | | | Move namespace closing brace inside the header guard blockFrancois Marier2017-10-121-1/+1
|/ / / / / / /
* | | | | | | Merge pull request #3739 from pherl/merge3.4Jisi Liu2017-10-1230-52/+1309
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Fix distcheckJisi Liu2017-10-111-0/+1
| * | | | | | Merge remote-tracking branch 'origin/3.4.x' into masterJisi Liu2017-10-1130-52/+1308
|/| | | | | | | | |_|/ / / | |/| | | |
| * | | | | Merge pull request #3690 from pherl/3.4.xJisi Liu2017-10-021-2/+2
| |\ \ \ \ \
| | * | | | | Remove ranged based for in io_win32.ccJisi Liu2017-09-271-2/+2
| * | | | | | Merge pull request #3691 from pherl/stringbackJisi Liu2017-09-291-1/+1
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Add spacesJisi Liu2017-09-271-1/+1
| | * | | | | Fix C++11 string accessorsJisi Liu2017-09-271-1/+1
| |/ / / / /
| * | | | | Merge pull request #3651 from pherl/3.4.xJisi Liu2017-09-151-1/+1
| |\ \ \ \ \