aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
Commit message (Expand)AuthorAge
* Merge from masterGravatar Jisi Liu2017-07-25
* Merge remote-tracking branch 'origin/3.4.x' into vbGravatar Jisi Liu2017-07-24
|\
| * Omit the zip test if tools are not availableGravatar Jisi Liu2017-07-24
* | Update required version on pre-generated filesGravatar Jisi Liu2017-07-24
* | Update pre generated filesGravatar Jisi Liu2017-07-24
* | Update version number for 3.4.0Gravatar Jisi Liu2017-07-24
|/
* Fix distcheckGravatar Jisi Liu2017-07-19
* remove profileGravatar Jisi Liu2017-07-19
* Merge master into 3.4.xGravatar Jisi Liu2017-07-18
|\
* | Merge from Google internal for 3.4 releaseGravatar Jisi Liu2017-07-18
| * Support PHP generic services (#3269)Gravatar Matt A2017-07-18
| * Merge pull request #3348 from matthauck/fix-gcc41-againGravatar Adam Cozzette2017-07-17
| |\
| * \ Merge pull request #3357 from bklarson/masterGravatar Adam Cozzette2017-07-17
| |\ \
| * \ \ Merge pull request #3134 from lundefugl/javabug1Gravatar Feng Xiao2017-07-17
| |\ \ \
| * | | | remove pass by reference for php setters (#3344)Gravatar Brent Shaffer2017-07-17
| * | | | removes an accidental newline in printing for the php generator (#3333)Gravatar Brent Shaffer2017-07-13
| * | | | Add space between arrow and casted type (#3353)Gravatar Paul Yang2017-07-13
| * | | | Merge pull request #3327 from htuch/fix-3322Gravatar Feng Xiao2017-07-13
| |\ \ \ \
| | | | * | Fix build when using -Werror=undefGravatar Brad Larson2017-07-12
| | |_|/ / | |/| | |
| | | | * Fix map_field_inl.h for gcc 4.1Gravatar Matt Hauck2017-07-11
| | |_|/ | |/| |
| * | | Fix missing std::tr1::hash on GCC 4.1 (#2907)Gravatar Matt Hauck2017-07-10
| * | | Add std:: namespace prefix to set and map (#3332)Gravatar tanderson-google2017-07-09
| | * | Use consistent hash across NDEBUG/!NDEBUG builds.Gravatar Harvey Tuch2017-07-07
| |/ /
| * | Add initialized as a reserved keyword as that's the actual property nameGravatar Sergio Campama2017-06-29
| * | adds PHPDoc @return and @param for getters and setters respectively (#3131)Gravatar Brent Shaffer2017-06-27
| * | Merge pull request #3264 from TeBoring/php-bugGravatar Paul Yang2017-06-24
| |\ \
| | * | Fix more implicit type conversions in public headers and generated code.Gravatar Bo Yang2017-06-24
| * | | Merge pull request #2968 from ngg/cpp-proper-fwdGravatar Feng Xiao2017-06-23
| |\ \ \
| | | * | Enusre public header and generated code have no implicit converion.Gravatar Bo Yang2017-06-23
| | |/ / | |/| |
| * | | Merge pull request #3240 from thomasvl/float_funGravatar Thomas Van Lenten2017-06-19
| |\ \ \
| | * | | Raise the number of digits used for floats.Gravatar Thomas Van Lenten2017-06-16
| * | | | Qualify string in java_options.hGravatar Calder Coalson2017-06-16
| |/ / /
| * | | Export symbols used in inline functionsGravatar Silvio Traversaro2017-06-12
| | * | C++: Do not forward-declare dependencies in generated .h filesGravatar Gergely Nagy2017-06-12
| |/ /
| * | Merge pull request #3176 from acozzette/fix-3114Gravatar Adam Cozzette2017-06-07
| |\ \
| * | | Add new file option php_namespace. (#3162)Gravatar Paul Yang2017-06-05
| | * | Ensure that for Java, imports of .proto files with empty packages worksGravatar Adam Cozzette2017-06-02
| |/ /
| * | not to use std::random_device for map.Seed(). (#3133)Gravatar Wayne Zhang2017-05-30
| * | Add ARRAY for reserved name (#3150)Gravatar Paul Yang2017-05-29
| * | Adds fluent setters for PHP (#3130)Gravatar Brent Shaffer2017-05-29
| | * Issue 3112: Object class with fully qualified nameGravatar lundefugl2017-05-24
| |/
| * Removing undefined behavior and compiler warnings (#1315)Gravatar brian-peloton2017-05-23
| * show help if protoc is called without any arguments, pre-empts -h and --help ...Gravatar Dennis Cappendijk2017-05-22
| * Workaround gcc < 4.5.0 bugGravatar Mario J. Rugiero2017-05-05
|/
* Merge remote-tracking branch 'remotes/google/3.3.x' into merge-3.3-to-masterGravatar Adam Cozzette2017-04-27
|\
* | Fully qualify min as std::min in wire_format_lite.ccGravatar Adam Cozzette2017-04-27
| * Add prefix to enum value with reserved name. (#3020)Gravatar Paul Yang2017-04-26
* | Merge pull request #3018 from acozzette/using-namespace-stdGravatar Adam Cozzette2017-04-26
|\ \
| * | Remove "using namespace std" from stubs/common.hGravatar Adam Cozzette2017-04-26
* | | Remove unused constants.Gravatar Jakob Buchgraber2017-04-25
|/ /