aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Expand)AuthorAge
* Merge pull request #3839 from thomasvl/message_equalityGravatar Thomas Van Lenten2017-11-03
|\
| * When comparing message, require them to have the same descriptor.Gravatar Thomas Van Lenten2017-11-03
|/
* Fix merging with message-valued oneofGravatar Jon Skeet2017-10-31
* Merge pull request #3817 from xuwei-k/joda-urlGravatar Feng Xiao2017-10-30
|\
| * update joda-time javadoc urlGravatar xuwei-k2017-10-30
|/
* Add parser settings WithXyz methodsGravatar Jon Skeet2017-10-28
* Add JsonParser setting to ignore unknown field valuesGravatar Jon Skeet2017-10-28
* Merge pull request #3722 from timou/cmake-windows-cleanGravatar Jisi Liu2017-10-27
|\
* | Reserve unknown in Ruby (#3763)Gravatar Paul Yang2017-10-26
* | Add missing filesGravatar Jisi Liu2017-10-26
* | Merge pull request #3804 from pherl/mergeGravatar Jisi Liu2017-10-26
|\ \
* \ \ Merge pull request #3791 from signalwerk/patch-1Gravatar Adam Cozzette2017-10-26
|\ \ \
| | * | Merge remote-tracking branch 'origin/3.4.x' into masterGravatar Jisi Liu2017-10-25
| |/| | |/| | |
* | | | Merge pull request #3787 from sergiocampama/coverageGravatar Thomas Van Lenten2017-10-24
|\ \ \ \
| * | | | Improves coverage of GPBCodedInputStreamGravatar Sergio Campama2017-10-24
|/ / / /
| * / / To be clear that we set a new variableGravatar Stefan Huber2017-10-24
|/ / /
| | * Sort MSVC warning suppressionsGravatar Tim Ebringer2017-10-21
| * | Merge pull request #3758 from spinorx/3.4.xGravatar Jisi Liu2017-10-20
| |\ \
* | \ \ Merge pull request #3757 from spinorx/masterGravatar Jisi Liu2017-10-20
|\ \ \ \
* \ \ \ \ Merge pull request #3743 from Schtolc/masterGravatar Jisi Liu2017-10-19
|\ \ \ \ \
* \ \ \ \ \ Merge pull request #3754 from toanju/gcc-fallthroughGravatar Jisi Liu2017-10-19
|\ \ \ \ \ \
* \ \ \ \ \ \ Merge pull request #3770 from pherl/3.5-integrateGravatar Jisi Liu2017-10-19
|\ \ \ \ \ \ \
| * | | | | | | Fix Java 1.6 compileGravatar Jisi Liu2017-10-18
* | | | | | | | Merge pull request #3751 from uykusuz/masterGravatar Jisi Liu2017-10-18
|\ \ \ \ \ \ \ \
| | | | | | * \ \ Merge pull request #3578 from pherl/filedeprecationGravatar Jisi Liu2017-10-18
| | | | | | |\ \ \
* | | | | | | \ \ \ Merge pull request #3764 from zearen/patch-1Gravatar Jisi Liu2017-10-18
|\ \ \ \ \ \ \ \ \ \
* \ \ \ \ \ \ \ \ \ \ Merge pull request #3698 from hesmar/hesmar/fixProtocIncludeDirsGravatar Jisi Liu2017-10-18
|\ \ \ \ \ \ \ \ \ \ \
| | | | | | | | * \ \ \ Merge pull request #3641 from drivehappy/3.4.x_clang_cleanup_3Gravatar Jisi Liu2017-10-18
| | | | | | | | |\ \ \ \
* | | | | | | | | \ \ \ \ Merge pull request #3706 from johanbrandhorst/patch-1Gravatar Jisi Liu2017-10-18
|\ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | Fix JS conformance testsGravatar Jisi Liu2017-10-18
| | | | | * | | | | | | | | Fix bazel buildGravatar Jisi Liu2017-10-18
| | | | | * | | | | | | | | Update descriptor protosGravatar Jisi Liu2017-10-18
* | | | | | | | | | | | | | Merge pull request #3736 from jleni/fix_rbpiGravatar Jisi Liu2017-10-18
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | | * \ \ \ \ \ \ \ \ Merge branch 'master' of github.com:google/protobufGravatar Jisi Liu2017-10-18
| | | | | | |\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | |
| | | | | | * | | | | | | | | Merge from google internalGravatar Jisi Liu2017-10-18
* | | | | | | | | | | | | | | Merge pull request #3769 from pherl/io_win32Gravatar Jisi Liu2017-10-18
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Fix unsiged underflowGravatar Jisi Liu2017-10-18
| * | | | | | | | | | | | | | Remove C++11 only usages in io_win32 tests.Gravatar Jisi Liu2017-10-18
|/ / / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge pull request #3760 from jmillikin-stripe/descriptor-memset-ubGravatar Feng Xiao2017-10-16
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Fix undefined memory management found by Clang's sanitizers.Gravatar John Millikin2017-10-16
|/ / / / / / / / / / / / / /
| | | | | | | | | | | | * / Fix iOS cc_library build for protobuf.Gravatar Param Reddy2017-10-15
| | | | | | | | | | |_|/ / | | | | | | | | | |/| | |
| | | | | | | | * / | | | Fix iOS cc_library build for protobuf.Gravatar Param Reddy2017-10-15
| |_|_|_|_|_|_|/ / / / / |/| | | | | | | | | | |
| | | | | | * | | | | | fix implicit fallthrough in gcc 7Gravatar Tobias Jungel2017-10-15
| |_|_|_|_|/ / / / / / |/| | | | | | | | | |
| | | | | * | | | | | fixes issue #3750Gravatar Boris Broenner2017-10-14
| |_|_|_|/ / / / / / |/| | | | | | | | |
* | | | | | | | | | Merge pull request #3744 from fmarier/json-escaping-namespaceGravatar Jisi Liu2017-10-13
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | Move namespace closing brace inside the header guard blockGravatar Francois Marier2017-10-12
|/ / / / / / / / / /
* | | | | | | | | | Merge pull request #3739 from pherl/merge3.4Gravatar Jisi Liu2017-10-12
|\ \ \ \ \ \ \ \ \ \
| | | | | | * | | | | CodedInputStream::SetTotalBytesLimit description fixGravatar Pavel2017-10-12
| |_|_|_|_|/ / / / / |/| | | | | | | | |
| * | | | | | | | | Fix distcheckGravatar Jisi Liu2017-10-11
| * | | | | | | | | Merge remote-tracking branch 'origin/3.4.x' into masterGravatar Jisi Liu2017-10-11
|/| | | | | | | | | | | |_|_|_|/ / / / | |/| | | | | | |