aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #1914 from adamatan/typo-fixFeng Xiao2016-08-031-1/+1
|\
| * Typo: beffer -> bufferAdam Matan2016-08-031-1/+1
|/
* Merge pull request #1878 from haberman/rubywktJoshua Haberman2016-08-014-2/+338
|\
| * Ruby: added custom Struct exception type and fixed Makefile.am.Josh Haberman2016-08-013-11/+42
| * Fix for JRuby (assert_true is not present).Josh Haberman2016-07-282-3/+3
| * Ruby: added API support for well-known types.Josh Haberman2016-07-283-0/+305
* | Merge pull request #1903 from xfxyjwf/compatibility_testsFeng Xiao2016-08-011-5/+5
|\ \
| * | Use 64-bit protoc binaries in compatibility tests.Feng Xiao2016-08-011-5/+5
|/ /
* | Merge pull request #1902 from podsvirov/topic-cmake-extract-includesFeng Xiao2016-08-011-1/+0
|\ \
| * | CMake: remove repeated_field_reflection.h from extract listKonstantin Podsvirov2016-08-011-1/+0
|/ /
* | Amend the conformance tests to only use Int64/Uint64 non-wrapped values which...Jon Skeet2016-07-312-8/+12
* | Merge pull request #1887 from sheffatguidance/fix-js-api-documentationJoshua Haberman2016-07-291-2/+1
|\ \
| * | Fix Issue #1869: faulty js API documentationsheffatguidance2016-07-291-2/+1
* | | Merge pull request #1884 from hochhaus/valueWriterFnJoshua Haberman2016-07-291-1/+1
|\ \ \
| * | | Fix valueWriterFn variable nameAndy Hochhaus2016-07-291-1/+1
| |/ /
* | | Merge pull request #1895 from google/3.0.0-GAJisi Liu2016-07-291-0/+1
|\ \ \
| * \ \ Merge pull request #1894 from pherl/fixdistJisi Liu2016-07-291-0/+1
| |\ \ \
| | * | | Add python/setup.cfg into dist filesJisi Liu2016-07-291-0/+1
| |/ / /
* | | | Merge pull request #1893 from google/3.0.0-GAJisi Liu2016-07-2923-53/+158
|\| | |
| * | | Merge pull request #1892 from xfxyjwf/compatibility_testsJisi Liu2016-07-292-0/+13
| |\ \ \
| | * | | Run Java compatibility tests on Travis.Feng Xiao2016-07-292-0/+13
| * | | | Merge pull request #1891 from pherl/pythonJisi Liu2016-07-291-0/+2
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | add setup.cfg for building wheelsJisi Liu2016-07-291-0/+2
| * | | | Merge pull request #1888 from pherl/fixbuildzipJisi Liu2016-07-291-2/+8
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Fix the build-zip.sh to add .exe for win packages.Jisi Liu2016-07-291-2/+8
| |/ / /
| * | | Merge pull request #1874 from pherl/buildzipJisi Liu2016-07-282-19/+31
| |\ \ \
| | * | | Change the build.zip.sh to support liteJisi Liu2016-07-282-19/+31
| * | | | Merge pull request #1871 from pherl/fixwinJisi Liu2016-07-281-5/+3
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Fix build protoc script for windowsJisi Liu2016-07-281-5/+3
| |/ / /
| * | | Merge pull request #1864 from pherl/galogsv3.0.0Jisi Liu2016-07-271-0/+51
| |\ \ \
| | * | | Change log for 3.0 GA release.Jisi Liu2016-07-271-0/+51
| |/ / /
| * | | Merge pull request #1853 from pherl/3.0.0-GAJisi Liu2016-07-262-8/+22
| |\ \ \
| | * | | fix comments.Jisi Liu2016-07-261-1/+1
| | * | | Merge remote-tracking branch 'origin/3.0.0-GA' into 3.0.0-GAJisi Liu2016-07-264-14/+23
| | |\ \ \ | | |/ / / | |/| | |
| * | | | Merge pull request #1851 from xfxyjwf/cintFeng Xiao2016-07-262-5/+5
| |\ \ \ \
| | * | | | Fixes traivs cpp build.Feng Xiao2016-07-262-5/+5
| |/ / / /
| * | | | Merge pull request #1847 from haberman/GAfixesJoshua Haberman2016-07-2612-18/+182
| |\ \ \ \
| | * | | | Fixed Makefile.am for Ruby file rename.Josh Haberman2016-07-261-1/+1
| | * | | | Merge branch 'master' into 3.0.0-GAJosh Haberman2016-07-2511-17/+181
| | |\ \ \ \ | | | | |_|/ | | | |/| |
| * | | | | Merge pull request #1841 from pherl/3.0.0-GAJisi Liu2016-07-2613-13/+13
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| * | | | | Define intX as standard exact-width integer types.Feng Xiao2016-07-252-12/+21
| | | | * | Fix the script comments.Jisi Liu2016-07-261-2/+2
| | | | * | Make protoc-artifacts able to build plugin.Jisi Liu2016-07-262-8/+22
| | | | * | Merge branch 'master' of github.com:google/protobuf into 3.0.0-GAJisi Liu2016-07-2611-17/+181
| | | |/| | | | |/|/ /
| | * | | remove extra zeros.Jisi Liu2016-07-251-1/+1
| | * | | Make jruby still depend on beta-4Jisi Liu2016-07-251-1/+1
| | * | | Bump version number for GAJisi Liu2016-07-2513-13/+13
| |/ / /
* | | | Merge pull request #1882 from legrosbuffle/fix-checkFeng Xiao2016-07-291-3/+4
|\ \ \ \ | |_|_|/ |/| | |
| * | | Be consistent with the use of CHECK()/ GOOGLE_CHECK().Clement Courbet2016-07-291-3/+4
|/ / /
* | | Fixed Makefile.am for Ruby file rename.Josh Haberman2016-07-271-1/+1