Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | Merge pull request #1926 from hotpxl/master | Feng Xiao | 2016-08-05 | 1 | -1/+2 | |
|\ \ \ \ | |/ / / |/| | | | ||||||
| * | | | [master] Add dependency cl. Fixes google/protobuf#295. | Yutian Li | 2016-08-05 | 1 | -1/+2 | |
|/ / / | ||||||
* | | | Merge pull request #1044 from mark-whiting/master | Feng Xiao | 2016-08-04 | 1 | -0/+18 | |
|\ \ \ | ||||||
| * | | | Adding missing generic gcc 64-bit atomicops. | Mark Whiting | 2015-12-14 | 1 | -0/+18 | |
* | | | | Merge pull request #1898 from sergiocampama/watchos | Thomas Van Lenten | 2016-08-04 | 1 | -0/+1 | |
|\ \ \ \ | |_|_|/ |/| | | | ||||||
| * | | | Adds watch os deployment target for protobuf | Sergio Campama | 2016-07-29 | 1 | -0/+1 | |
* | | | | Merge pull request #1865 from podsvirov/topic-cmake-project | Feng Xiao | 2016-08-03 | 4 | -2/+9 | |
|\ \ \ \ | ||||||
| * | | | | CMake: Auto find ZLIB from package config if nedded | Konstantin Podsvirov | 2016-08-02 | 2 | -0/+5 | |
| * | | | | CMake: Bugfix for protobuf_MODULE_COMPATIBLE | Konstantin Podsvirov | 2016-07-28 | 1 | -1/+0 | |
| * | | | | CMake: Link to ZLIB only if protobuf_WITH_ZLIB enabled | Konstantin Podsvirov | 2016-07-28 | 1 | -1/+4 | |
* | | | | | Merge pull request #1914 from adamatan/typo-fix | Feng Xiao | 2016-08-03 | 1 | -1/+1 | |
|\ \ \ \ \ | ||||||
| * | | | | | Typo: beffer -> buffer | Adam Matan | 2016-08-03 | 1 | -1/+1 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #1878 from haberman/rubywkt | Joshua Haberman | 2016-08-01 | 4 | -2/+338 | |
|\ \ \ \ \ | ||||||
| * | | | | | Ruby: added custom Struct exception type and fixed Makefile.am. | Josh Haberman | 2016-08-01 | 3 | -11/+42 | |
| * | | | | | Fix for JRuby (assert_true is not present). | Josh Haberman | 2016-07-28 | 2 | -3/+3 | |
| * | | | | | Ruby: added API support for well-known types. | Josh Haberman | 2016-07-28 | 3 | -0/+305 | |
| | |_|_|/ | |/| | | | ||||||
* | | | | | Merge pull request #1903 from xfxyjwf/compatibility_tests | Feng Xiao | 2016-08-01 | 1 | -5/+5 | |
|\ \ \ \ \ | ||||||
| * | | | | | Use 64-bit protoc binaries in compatibility tests. | Feng Xiao | 2016-08-01 | 1 | -5/+5 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #1902 from podsvirov/topic-cmake-extract-includes | Feng Xiao | 2016-08-01 | 1 | -1/+0 | |
|\ \ \ \ \ | ||||||
| * | | | | | CMake: remove repeated_field_reflection.h from extract list | Konstantin Podsvirov | 2016-08-01 | 1 | -1/+0 | |
|/ / / / / | ||||||
* | | / / | Amend the conformance tests to only use Int64/Uint64 non-wrapped values which... | Jon Skeet | 2016-07-31 | 2 | -8/+12 | |
| |_|/ / |/| | | | ||||||
* | | | | Merge pull request #1887 from sheffatguidance/fix-js-api-documentation | Joshua Haberman | 2016-07-29 | 1 | -2/+1 | |
|\ \ \ \ | ||||||
| * | | | | Fix Issue #1869: faulty js API documentation | sheffatguidance | 2016-07-29 | 1 | -2/+1 | |
| | |/ / | |/| | | ||||||
* | | | | Merge pull request #1884 from hochhaus/valueWriterFn | Joshua Haberman | 2016-07-29 | 1 | -1/+1 | |
|\ \ \ \ | ||||||
| * | | | | Fix valueWriterFn variable name | Andy Hochhaus | 2016-07-29 | 1 | -1/+1 | |
| |/ / / | ||||||
* | | | | Merge pull request #1895 from google/3.0.0-GA | Jisi Liu | 2016-07-29 | 1 | -0/+1 | |
|\ \ \ \ | ||||||
| * \ \ \ | Merge pull request #1894 from pherl/fixdist | Jisi Liu | 2016-07-29 | 1 | -0/+1 | |
| |\ \ \ \ | ||||||
| | * | | | | Add python/setup.cfg into dist files | Jisi Liu | 2016-07-29 | 1 | -0/+1 | |
| |/ / / / | ||||||
* | | | | | Merge pull request #1893 from google/3.0.0-GA | Jisi Liu | 2016-07-29 | 23 | -53/+158 | |
|\| | | | | ||||||
| * | | | | Merge pull request #1892 from xfxyjwf/compatibility_tests | Jisi Liu | 2016-07-29 | 2 | -0/+13 | |
| |\ \ \ \ | ||||||
| | * | | | | Run Java compatibility tests on Travis. | Feng Xiao | 2016-07-29 | 2 | -0/+13 | |
| * | | | | | Merge pull request #1891 from pherl/python | Jisi Liu | 2016-07-29 | 1 | -0/+2 | |
| |\ \ \ \ \ | | |/ / / / | |/| | | | | ||||||
| | * | | | | add setup.cfg for building wheels | Jisi Liu | 2016-07-29 | 1 | -0/+2 | |
| * | | | | | Merge pull request #1888 from pherl/fixbuildzip | Jisi Liu | 2016-07-29 | 1 | -2/+8 | |
| |\ \ \ \ \ | | |/ / / / | |/| | | | | ||||||
| | * | | | | Fix the build-zip.sh to add .exe for win packages. | Jisi Liu | 2016-07-29 | 1 | -2/+8 | |
| |/ / / / | ||||||
| * | | | | Merge pull request #1874 from pherl/buildzip | Jisi Liu | 2016-07-28 | 2 | -19/+31 | |
| |\ \ \ \ | ||||||
| | * | | | | Change the build.zip.sh to support lite | Jisi Liu | 2016-07-28 | 2 | -19/+31 | |
| * | | | | | Merge pull request #1871 from pherl/fixwin | Jisi Liu | 2016-07-28 | 1 | -5/+3 | |
| |\ \ \ \ \ | | |/ / / / | |/| | | | | ||||||
| | * | | | | Fix build protoc script for windows | Jisi Liu | 2016-07-28 | 1 | -5/+3 | |
| |/ / / / | ||||||
| * | | | | Merge pull request #1864 from pherl/galogsv3.0.0 | Jisi Liu | 2016-07-27 | 1 | -0/+51 | |
| |\ \ \ \ | ||||||
| | * | | | | Change log for 3.0 GA release. | Jisi Liu | 2016-07-27 | 1 | -0/+51 | |
| |/ / / / | ||||||
| * | | | | Merge pull request #1853 from pherl/3.0.0-GA | Jisi Liu | 2016-07-26 | 2 | -8/+22 | |
| |\ \ \ \ | ||||||
| | * | | | | fix comments. | Jisi Liu | 2016-07-26 | 1 | -1/+1 | |
| | * | | | | Merge remote-tracking branch 'origin/3.0.0-GA' into 3.0.0-GA | Jisi Liu | 2016-07-26 | 4 | -14/+23 | |
| | |\ \ \ \ | | |/ / / / | |/| | | | | ||||||
| * | | | | | Merge pull request #1851 from xfxyjwf/cint | Feng Xiao | 2016-07-26 | 2 | -5/+5 | |
| |\ \ \ \ \ | ||||||
| | * | | | | | Fixes traivs cpp build. | Feng Xiao | 2016-07-26 | 2 | -5/+5 | |
| |/ / / / / | ||||||
| * | | | | | Merge pull request #1847 from haberman/GAfixes | Joshua Haberman | 2016-07-26 | 12 | -18/+182 | |
| |\ \ \ \ \ | ||||||
| | * | | | | | Fixed Makefile.am for Ruby file rename. | Josh Haberman | 2016-07-26 | 1 | -1/+1 | |
| | * | | | | | Merge branch 'master' into 3.0.0-GA | Josh Haberman | 2016-07-25 | 11 | -17/+181 | |
| | |\ \ \ \ \ | | | | |_|/ / | | | |/| | | | ||||||
| * | | | | | | Merge pull request #1841 from pherl/3.0.0-GA | Jisi Liu | 2016-07-26 | 13 | -13/+13 | |
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | | |