aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/google
Commit message (Expand)AuthorAge
* Revert "Fix js conformance tests. (#3604)" (#3633)Gravatar Paul Yang2017-09-13
* Fix js conformance tests. (#3604)Gravatar Paul Yang2017-09-12
* change the field number of php_generic_service to fix the conflict with (#3576)Gravatar Paul Yang2017-08-30
* Disable death tests on windowsGravatar Jisi Liu2017-08-22
* Merge pull request #3539 from drivehappy/3.4.x_clang_cleanup_1Gravatar Jisi Liu2017-08-22
|\
* | Merge pull request #3494 from drivehappy/clang_warning_macroGravatar Jisi Liu2017-08-21
| * Merge pull request #3535 from drivehappy/clang_warn_cleanupGravatar Jisi Liu2017-08-21
|/
* Fix compile errorsGravatar Jisi Liu2017-08-21
* Remove C++11 features in io_win32.ccGravatar Jisi Liu2017-08-21
* Fix cmath/math.h include with non C++11 libstdc++Gravatar Jisi Liu2017-08-15
* Merge pull request #3485 from pherl/mingwGravatar Jisi Liu2017-08-11
|\
| * Fix commentsGravatar Jisi Liu2017-08-11
* | Make compilers without ref-qualifier support happy.Gravatar Jisi Liu2017-08-11
| * Add malloc castGravatar Jisi Liu2017-08-11
| * implement remove strdup usage and implement our ownGravatar Jisi Liu2017-08-11
| * Adding missing imports for strdupGravatar Jisi Liu2017-08-11
| * Fix mkdirGravatar Jisi Liu2017-08-11
| * Make win32_io only for MSVCGravatar Jisi Liu2017-08-11
| * Fix the declaration order in ming32Gravatar Jisi Liu2017-08-11
| * Fixing io_win32 for MinGW32Gravatar Jisi Liu2017-08-11
|/
* Make code free of missing-field-initializers warningsGravatar Jisi Liu2017-08-09
* Merge branch 'master' into 3.4.xGravatar Bo Yang2017-08-05
|\
* | Fix invalid offsetof warning.Gravatar Jisi Liu2017-08-03
* | Add destructors for default instances to the shutdown code.Gravatar Gerben Stavenga2017-08-02
* | Adding the missing headerGravatar Jisi Liu2017-08-01
* | Export functions in io_win32.h in win DLL buildGravatar Jisi Liu2017-08-01
| * Add a objc_class_prefix to test_messages_proto3.proto.Gravatar Thomas Van Lenten2017-07-26
| * Merge pull request #3410 from adam-26/1745Gravatar Adam Cozzette2017-07-25
| |\
* | | Merge remote-tracking branch 'origin/master' into mergeGravatar Jisi Liu2017-07-25
|\| |
* | | Merge from masterGravatar Jisi Liu2017-07-25
| * | Merge pull request #3407 from bklarson/masterGravatar Adam Cozzette2017-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
|/ / / /
| | * | Put AddDescriptorsImpl() in anonymous namespaceGravatar Brad Larson2017-07-24
| * | | Merge pull request #3281 from BSBandme/ConformanceTestYilunChongGravatar Yilun Chong2017-07-24
| |\ \ \
| | | | * Fix quotation marksGravatar Adam2017-07-24
| | | | * Fix issue #1745 - javascript allow dot in filenameGravatar Adam2017-07-24
| | |_|/ | |/| |
| * | | Merge pull request #2969 from laszlocsomor/masterGravatar Feng Xiao2017-07-24
| |\ \ \ | | |_|/ | |/| |
| * | | Fixed dynamic initialization for C++ liteGravatar Adam Cozzette2017-07-19
* | | | remove profileGravatar Jisi Liu2017-07-19
| * | | Merge pull request #3375 from TeBoring/3.3.xGravatar Paul Yang2017-07-19
| |\ \ \
* | | | | Merge master into 3.4.xGravatar Jisi Liu2017-07-18
|\| | | |
* | | | | Merge from Google internal for 3.4 releaseGravatar Jisi Liu2017-07-18
| | * | | Merge 3.3.x into masterGravatar Bo Yang2017-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
| |\ \ \ \ \ \