aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* 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
| * Merge pull request #3565 from pherl/fixdistJisi Liu2017-08-242-1/+2
| |\
| | * Add mising cmake files in distJisi Liu2017-08-242-1/+2
| |/
| * Merge pull request #3556 from matt-kwong/kokoro_mac_v3Jisi Liu2017-08-231-1/+3
| |\
| | * Remove pre-installed softwaresMatt Kwong2017-08-231-1/+3
| |/
| * Merge pull request #3555 from pherl/fixdistJisi Liu2017-08-232-3/+9
| |\
| | * Make distcheck aware of test proto files.Jisi Liu2017-08-232-3/+9
| |/
* | Merge pull request #3735 from sgreenstein/patch-1Feng Xiao2017-10-101-1/+3
|\ \
| * | Don't pass -lpthread and -lm on WindowsSeth Greenstein2017-10-101-1/+3
|/ /
* | Reserve unknown fields in php (#3659)Paul Yang2017-10-0912-841/+2101
* | Add well known types to php runtime. (#3697)Paul Yang2017-10-0543-144/+5450
* | Fix ruby segment fault (#3708)Paul Yang2017-10-038-9/+88
* | Merge pull request #3714 from thomasvl/objc_increase_test_coverageThomas Van Lenten2017-10-0311-42/+524
|\ \
| * | Build out more complete code coverage in the tests.Thomas Van Lenten2017-10-035-36/+494
| * | Let Xcode 9 update project/scheme settings.Thomas Van Lenten2017-10-036-6/+30
|/ /
* | Merge pull request #3710 from thomasvl/xcode9Thomas Van Lenten2017-10-021-0/+6
|\ \
| * | Add Xcode 9 support to the helper script.Thomas Van Lenten2017-10-021-0/+6
* | | Merge pull request #3709 from thomasvl/unknown_field_merge_issueThomas Van Lenten2017-10-022-11/+21
|\ \ \ | |/ / |/| |
| * | ObjC: Fix merging of length delimited unknown fields.Thomas Van Lenten2017-10-022-11/+21
|/ /