aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | 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
| |\ \ \ \ \
| | * | | | | Bumping minor version for ruby gemsJisi Liu2017-09-151-1/+1
| * | | | | | Merge pull request #3612 from TeBoring/php-bugPaul Yang2017-09-1514-30/+1087
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Rename ClassNamePrefix to ConstantNamePrefixBo Yang2017-09-131-4/+3
| | * | | | | Exclude valid constant name from reserved name.Bo Yang2017-09-129-238/+652
| | * | | | | Change array to map for reserved names in c extensionBo Yang2017-09-113-24/+69
| | * | | | | Change array to associate array.Bo Yang2017-09-111-20/+21
| | * | | | | Add prefix to php reserved keywords.Bo Yang2017-09-0810-17/+615
| * | | | | | Merge pull request #3642 from pherl/3.4.xv3.4.1Jisi Liu2017-09-1413-16/+32
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | |
| | * | | | | Bump version for minor releaseJisi Liu2017-09-1413-16/+32
| |/ / / / /
| * | | | | Merge pull request #3634 from TeBoring/ruby-bugPaul Yang2017-09-135-23/+37
| |\ \ \ \ \
| | * | | | | Storing the frame on the map means we don't need the arrayAaron Patterson2017-09-133-14/+9
| | * | | | | Move parse frame array to the Map objectAaron Patterson2017-09-135-23/+42
| |/ / / / /
| * | | | | Revert "Fix js conformance tests. (#3604)" (#3633)Paul Yang2017-09-136-44/+93
| * | | | | Fix js conformance tests. (#3604)Paul Yang2017-09-126-93/+44
| |/ / / /
| * | | | Merge pull request #3596 from jtattermusch/csharp_target_net45Jan Tattermusch2017-09-071-1/+1
| |\ \ \ \
| | * | | | Google.Protobuf should target net45Jan Tattermusch2017-09-051-1/+1
| |/ / / /
| * | | | change the field number of php_generic_service to fix the conflict with (#3576)Paul Yang2017-08-308-151/+216
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-27 23:19:42 +0000