Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #2969 from laszlocsomor/master | Feng Xiao | 2017-07-24 | 19 | -81/+970 |
|\ | |||||
| * | Windows: support long paths | Laszlo Csomor | 2017-07-11 | 19 | -81/+970 |
* | | Merge pull request #3403 from ax3l/topic-cmake-pkgconfig | Adam Cozzette | 2017-07-24 | 4 | -0/+30 |
|\ \ | |||||
| * | | Travis: Exclude CMake .pc files | Axel Huebl | 2017-07-23 | 1 | -0/+1 |
| * | | CMake: Install .pc Files | Axel Huebl | 2017-07-23 | 3 | -0/+29 |
|/ / | |||||
* | | Merge pull request #3401 from aschrijver/patch-2 | Adam Cozzette | 2017-07-21 | 1 | -1/+1 |
|\ \ | |||||
| * | | Updated outdated hyperlink | Arnold Schrijver | 2017-07-21 | 1 | -1/+1 |
|/ / | |||||
* | | Merge pull request #3179 from bjwatson/fix-duration-typo | Feng Xiao | 2017-07-20 | 1 | -2/+2 |
|\ \ | |||||
| * | | Fix typos in comment | Brian J. Watson | 2017-06-21 | 1 | -2/+2 |
* | | | Merge pull request #3397 from acozzette/initialization | Adam Cozzette | 2017-07-20 | 15 | -75/+26 |
|\ \ \ | |||||
| * | | | Fixed dynamic initialization for C++ lite | Adam Cozzette | 2017-07-19 | 15 | -75/+26 |
* | | | | Merge pull request #3262 from snnn/master | Jie Luo | 2017-07-19 | 3 | -5/+11 |
|\ \ \ \ | |/ / / |/| | | | |||||
| * | | | Fix a bazel build error on Windows | Changming Sun | 2017-06-22 | 3 | -5/+11 |
| |/ / | |||||
* | | | compiles removal of newline (#3333) (#3370) | Brent Shaffer | 2017-07-19 | 25 | -25/+0 |
* | | | Merge pull request #3375 from TeBoring/3.3.x | Paul Yang | 2017-07-19 | 54 | -88/+259 |
|\ \ \ | |||||
| * \ \ | Merge 3.3.x into master | Bo Yang | 2017-07-18 | 54 | -88/+259 |
| |\ \ \ | |||||
| | * \ \ | Merge pull request #3258 from TeBoring/3.3.xv3.3.23.3.x | Paul Yang | 2017-06-21 | 28 | -30/+46 |
| | |\ \ \ | |||||
| | | * | | | Update C++ generated code. | Bo Yang | 2017-06-21 | 13 | -13/+13 |
| | | * | | | Update version number to 3.3.2 | Bo Yang | 2017-06-21 | 15 | -17/+33 |
| | |/ / / | |||||
| | * | | | Merge pull request #3255 from TeBoring/3.3.x-3 | Paul Yang | 2017-06-20 | 10 | -7/+28 |
| | |\ \ \ | |||||
| | | * | | | Remove inclusion of ext/json/php_json.h. (#3241) | Jeff Ching | 2017-06-20 | 1 | -1/+0 |
| | | * | | | Oneof field should be serialized even it's equal to default. (#3153) | Paul Yang | 2017-06-20 | 3 | -1/+17 |
| | | * | | | Add ARRAY for reserved name (#3150) | Paul Yang | 2017-06-20 | 6 | -5/+11 |
| | |/ / / | |||||
| | * | | | Merge pull request #3085 from scpeters/issue_3059 | Feng Xiao | 2017-05-19 | 14 | -0/+59 |
| | |\ \ \ | |||||
| | | * | | | regenerate plugin and profile message code | Steven Peters | 2017-05-11 | 2 | -0/+4 |
| | | * | | | Use bool deterministic to suppress warning | Steven Peters | 2017-05-11 | 13 | -0/+55 |
| | * | | | | Update jenkins Java deps.v3.3.1 | Feng Xiao | 2017-05-12 | 1 | -1/+1 |
| | * | | | | Revert guava depedency to version 19. | Feng Xiao | 2017-05-12 | 3 | -27/+14 |
| | |/ / / | |||||
| | * | | | Add LICENSE in package.xml (#3083) | Paul Yang | 2017-05-11 | 1 | -0/+1 |
| | * | | | Merge pull request #3074 from xfxyjwf/3.3.x | Feng Xiao | 2017-05-11 | 28 | -30/+46 |
| | |\ \ \ | |||||
| | | * | | | Update C++ generated code. | Feng Xiao | 2017-05-08 | 13 | -13/+13 |
| | | * | | | Update version number to 3.3.1 | Feng Xiao | 2017-05-08 | 15 | -17/+33 |
| | * | | | | Fix upb load descriptor when no messages defined in prorto. (#3080) | Paul Yang | 2017-05-11 | 1 | -0/+3 |
| | * | | | | Fix c extension for php7.1. (#3077) | Paul Yang | 2017-05-10 | 4 | -25/+98 |
| | |/ / / | |||||
| | * | | | Merge pull request #3073 from xfxyjwf/3.3.x | Feng Xiao | 2017-05-08 | 1 | -1/+2 |
| | |\ \ \ | |||||
| | | * | | | Workaround gcc < 4.5.0 bug | Mario J. Rugiero | 2017-05-08 | 1 | -1/+2 |
| | * | | | | Merge pull request #3064 from randomguy3/offset-type | Feng Xiao | 2017-05-08 | 1 | -1/+1 |
| | |\ \ \ \ | | | |/ / / | | |/| | | | |||||
| | | * | | | Fix compilation | randomguy3 | 2017-05-06 | 1 | -1/+1 |
| | | * | | | Fix offset type to match the tables it is used in | Alex Merry | 2017-05-05 | 1 | -1/+1 |
| | |/ / / | |||||
| | * | | | Merge pull request #3057 from xfxyjwf/3.3.x | Feng Xiao | 2017-05-05 | 7 | -5/+18 |
| | |\ \ \ | |||||
| | | * | | | Add missing LIBRPOTOC_EXPORT. | Feng Xiao | 2017-05-04 | 1 | -2/+2 |
| | | * | | | Skip C# test in C++ only distribution. | Feng Xiao | 2017-05-04 | 1 | -0/+8 |
| | | * | | | Add missing files to build files. | Feng Xiao | 2017-05-04 | 5 | -3/+8 |
| | * | | | | Merge pull request #3056 from acozzette/cherry-pick-pr-2873 | Adam Cozzette | 2017-05-05 | 3 | -14/+14 |
| | |\ \ \ \ | | | |/ / / | | |/| | | | |||||
| | | * | | | Fix #1562 by using goog.crypt.byteArrayToString instead of String.fromCharCod... | Paul Jolly | 2017-05-04 | 3 | -14/+14 |
| | |/ / / | |||||
| | * | | | Merge pull request #3055 from chrisn-arm/3.3.x | Feng Xiao | 2017-05-04 | 1 | -0/+7 |
| | |\ \ \ | |||||
| | | * | | | Fix issue 3046: compilation on alpine 3.5 | Chris Nix | 2017-05-04 | 1 | -0/+7 |
| | |/ / / | |||||
* | | | | | Merge pull request #3390 from danielgtaylor-isp/patch-1 | Feng Xiao | 2017-07-18 | 1 | -0/+4 |
|\ \ \ \ \ | |||||
| * | | | | | Add note about includes to README | Daniel Taylor | 2017-07-18 | 1 | -0/+4 |
* | | | | | | Merge pull request #3385 from anandolee/master | Jie Luo | 2017-07-18 | 1 | -0/+1 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | |