aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Expand)AuthorAge
* Fix conformance testsGravatar Jisi Liu2017-07-25
* Fix build filesGravatar Jisi Liu2017-07-25
* Remove dependency on guava 20Gravatar Jisi Liu2017-07-25
* Update conformance testsGravatar Jisi Liu2017-07-25
* Merge remote-tracking branch 'origin/master' into mergeGravatar Jisi Liu2017-07-25
|\
* | Merge from masterGravatar Jisi Liu2017-07-25
| * need for php math functions. used in mergeFromJsonString (#3409)Gravatar Sergey2017-07-25
| * Merge pull request #3407 from bklarson/masterGravatar Adam Cozzette2017-07-25
| |\
| * | Fix cycle dependency for repeated field not collected by gc (#3399)Gravatar Paul Yang2017-07-25
* | | Merge pull request #3413 from pherl/3.4.xGravatar Jisi Liu2017-07-25
|\ \ \
| * \ \ Merge remote-tracking branch 'origin/3.4.x' into vbGravatar Jisi Liu2017-07-24
| |\ \ \ | |/ / / |/| | |
* | | | Merge pull request #3414 from pherl/fixzipGravatar Jisi Liu2017-07-24
|\ \ \ \
* \ \ \ \ Merge pull request #3412 from anandolee/3.4.xGravatar Jisi Liu2017-07-24
|\ \ \ \ \
| | * | | | Omit the zip test if tools are not availableGravatar Jisi Liu2017-07-24
| |/ / / / |/| | | |
| * | | | Add __bool__ as well as __nonzero__ for python3Gravatar Jie Luo2017-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
| |/ / / |/| | |
| * | | Use keys() instead of iterkeys() to be python3 compatbile.Gravatar Jie Luo2017-07-24
|/ / /
* | | Merge pull request #3393 from pherl/3.4.xGravatar Jisi Liu2017-07-24
|\ \ \
| | | * Put AddDescriptorsImpl() in anonymous namespaceGravatar Brad Larson2017-07-24
| | * | Merge pull request #3281 from BSBandme/ConformanceTestYilunChongGravatar Yilun Chong2017-07-24
| | |\ \
| | * \ \ Merge pull request #2969 from laszlocsomor/masterGravatar Feng Xiao2017-07-24
| | |\ \ \
| | | | | * Add -Werror=missing-declarations to test buildsGravatar Brad Larson2017-07-24
| | | |_|/ | | |/| |
| | * | | Merge pull request #3403 from ax3l/topic-cmake-pkgconfigGravatar Adam Cozzette2017-07-24
| | |\ \ \
| | | * | | Travis: Exclude CMake .pc filesGravatar Axel Huebl2017-07-23
| | | * | | CMake: Install .pc FilesGravatar Axel Huebl2017-07-23
| | |/ / /
| | * | | Merge pull request #3401 from aschrijver/patch-2Gravatar Adam Cozzette2017-07-21
| | |\ \ \
| | | * | | Updated outdated hyperlinkGravatar Arnold Schrijver2017-07-21
| | |/ / /
| | * | | Merge pull request #3179 from bjwatson/fix-duration-typoGravatar Feng Xiao2017-07-20
| | |\ \ \
| | * \ \ \ Merge pull request #3397 from acozzette/initializationGravatar Adam Cozzette2017-07-20
| | |\ \ \ \
| | * \ \ \ \ Merge pull request #3262 from snnn/masterGravatar Jie Luo2017-07-19
| | |\ \ \ \ \
| | | | * | | | Fixed dynamic initialization for C++ liteGravatar Adam Cozzette2017-07-19
| | | |/ / / / | | |/| | | |
| * | | | | | Fix code to use values() insteadGravatar Jisi Liu2017-07-19
| | * | | | | compiles removal of newline (#3333) (#3370)Gravatar Brent Shaffer2017-07-19
| * | | | | | Update filelist againGravatar Jisi Liu2017-07-19
| * | | | | | Add lite and python extra_dist filesGravatar Jisi Liu2017-07-19
| * | | | | | Add java and JS dist files.Gravatar Jisi Liu2017-07-19
| * | | | | | remove broken imports in JSGravatar Jisi Liu2017-07-19
| * | | | | | Use itmes() instead of itervalues() to be python3 compatbile.Gravatar Jisi Liu2017-07-19
| * | | | | | Fix distcheckGravatar Jisi Liu2017-07-19
| * | | | | | remove profileGravatar Jisi Liu2017-07-19
| * | | | | | update build file listGravatar Jisi Liu2017-07-19
| * | | | | | Update conformance testsGravatar 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
| |\ \ \ \ \ \ | |/ / / / / / |/| | | | | |
| * | | | | | Update csharp and php descriptorGravatar Jisi Liu2017-07-18
| * | | | | | Merge from Google internal for 3.4 releaseGravatar Jisi Liu2017-07-18
* | | | | | | Merge pull request #3390 from danielgtaylor-isp/patch-1Gravatar Feng Xiao2017-07-18
|\ \ \ \ \ \ \
| | | * \ \ \ \ Merge 3.3.x into masterGravatar Bo Yang2017-07-18
| | | |\ \ \ \ \