aboutsummaryrefslogtreecommitdiff
path: root/Makefile.am
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/3.5.x' into masterJisi Liu2018-01-031-0/+1
|\
| * Cherrypick for csharp, including:Jie Luo2017-12-191-1/+13
| * Add discard unknown API in ruby. (#3990)Paul Yang2017-12-071-0/+1
* | Add unknown field support for csharp (#3936)Jie Luo2017-12-131-1/+5
* | Compare floating point values bitwise in C#Jon Skeet2017-12-091-0/+3
* | Updated Makefile.am to add a new file to EXTRA_DISTAdam Cozzette2017-12-011-0/+1
* | Add a UTF-8 decoder that uses Unsafe to directly decode a byte buffer.Anuraag Agrawal2017-11-291-0/+1
* | Fix up warnings from Xcode 9.1 (#3887)dmaclach2017-11-161-9/+14
* | Move C#-only test protos to csharp/protosJon Skeet2017-11-121-0/+5
|/
* Merge remote-tracking branch 'origin/3.4.x' into masterJisi Liu2017-10-251-0/+1
|\
| * Merge pull request #3578 from pherl/filedeprecationJisi Liu2017-10-181-0/+1
| |\
| | * Fix dist checkJisi Liu2017-08-311-0/+1
* | | Fix distcheckJisi Liu2017-10-111-0/+1
* | | Merge remote-tracking branch 'origin/3.4.x' into masterJisi Liu2017-10-111-0/+11
|\| |
| * | Exclude valid constant name from reserved name.Bo Yang2017-09-121-0/+2
| * | Add prefix to php reserved keywords.Bo Yang2017-09-081-0/+4
| * | change the field number of php_generic_service to fix the conflict with (#3576)Paul Yang2017-08-301-0/+1
| |/
| * Add mising cmake files in distJisi Liu2017-08-241-0/+2
* | Add well known types to php runtime. (#3697)Paul Yang2017-10-051-42/+76
* | Fix ruby segment fault (#3708)Paul Yang2017-10-031-0/+1
* | Enforce all error report for php tests. (#3670)Paul Yang2017-09-221-0/+1
* | Integrated internal changes from GoogleAdam Cozzette2017-09-141-0/+1
* | Update examples file list.Feng Xiao2017-09-111-6/+7
* | Add native php support for Duration. (#3583)Paul Yang2017-09-051-0/+2
* | Add php support for Timestamp. (#3575)Paul Yang2017-08-311-0/+2
* | Add any support in php runtime. (#3486)Paul Yang2017-08-251-0/+2
|/
* Merge branch 'master' into 3.4.xBo Yang2017-08-051-1/+10
|\
| * Update PHP descriptors (#3391)michaelbausor2017-08-041-1/+8
| * Expose descriptor API in php c extension (#3422)Paul Yang2017-08-021-0/+2
* | Add lite and python extra_dist filesJisi Liu2017-07-191-0/+4
* | Add java and JS dist files.Jisi Liu2017-07-191-0/+23
* | Merge master into 3.4.xJisi Liu2017-07-181-52/+71
|\|
| * Support PHP generic services (#3269)Matt A2017-07-181-0/+3
| * Add json encode/decode for php. (#3226)Paul Yang2017-06-301-44/+48
| * Add scripts to build python wheel for linux. (#2693)Paul Yang2017-06-281-0/+5
| * adds PHPDoc @return and @param for getters and setters respectively (#3131)Brent Shaffer2017-06-271-0/+1
| * Follows proper autoloading standards (#3123)Brent Shaffer2017-06-141-1/+8
| * Add new file option php_namespace. (#3162)Paul Yang2017-06-051-1/+3
| * Convert C# projects to MSBuild (csproj) formatJon Skeet2017-05-241-13/+8
| * Fix ExtensionRegistry copying and add tests.Thomas Van Lenten2017-05-171-0/+1
| * Add compatibility test for php. (#3041)Paul Yang2017-05-051-0/+1
* | Merge from Google internal for 3.4 releaseJisi Liu2017-07-181-2/+0
|/
* Merge remote-tracking branch 'remotes/google/3.3.x' into merge-3.3-to-masterAdam Cozzette2017-04-271-1/+5
|\
| * Throw exception when parsing invalid data. (#3000)Paul Yang2017-04-211-0/+1
| * Allow proto files to import descriptor.proto (#2995)Paul Yang2017-04-201-0/+1
| * Down-integrate from google3.Feng Xiao2017-03-291-1/+3
* | Added compatibility tests for version 3.0.0Adam Cozzette2017-04-031-45/+74
|/
* Add file option php_class_prefix (#2849)Paul Yang2017-03-171-21/+23
* Ruby: wrap calls to memcpy so that gem is compatible with pre-2.14 glibcAdam Cozzette2017-03-091-0/+1
* Add Ruby compatibilty test against 3.0.0.Feng Xiao2017-02-271-0/+9
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-19 19:12:35 +0000