Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Add VERSION property to CMake library targets | Corentin Le Molgat | 2018-02-01 | 3 | -0/+3 |
* | Remove broken link to code.google.com/p/protorpc | Leigh McCulloch | 2018-01-25 | 1 | -1/+0 |
* | Merge pull request #3934 from xfxyjwf/builtsources | Feng Xiao | 2018-01-25 | 1 | -4/+4 |
|\ | |||||
| * | Remove the use of BUILT_SOURCES | Feng Xiao | 2018-01-24 | 1 | -4/+4 |
* | | Update .NET SDK to 2.0.3 | Jon Skeet | 2018-01-25 | 3 | -6/+17 |
* | | Merge pull request #4226 from themattchan/patch-1 | Feng Xiao | 2018-01-25 | 1 | -0/+2 |
|\ \ | |||||
| * | | Add Haskell implementations | Matt Chan | 2018-01-24 | 1 | -0/+2 |
* | | | Add an explicit import of stdatomic.h. | Thomas Van Lenten | 2018-01-25 | 4 | -2/+39 |
* | | | Bring back import of OSAtomic. | Thomas Van Lenten | 2018-01-25 | 1 | -0/+6 |
|/ / | |||||
* | | Merge pull request #4224 from davido/drop_java_6_support | Feng Xiao | 2018-01-24 | 2 | -4/+4 |
|\ \ | |/ |/| | |||||
| * | Drop java 6 support | David Ostrovsky | 2018-01-25 | 2 | -4/+4 |
|/ | |||||
* | Merge pull request #4205 from xuwei-k/patch-2 | Feng Xiao | 2018-01-23 | 1 | -1/+1 |
|\ | |||||
| * | fix typo in FieldMaskTree.java comment | kenji yoshida | 2018-01-22 | 1 | -1/+1 |
* | | Migrate away from deprecated OSAtomic APIs. (#4184) | Jonathan Dierksen | 2018-01-22 | 6 | -16/+20 |
|/ | |||||
* | Add DiscardUnknownFields support for C# | Jon Skeet | 2018-01-15 | 5 | -56/+173 |
* | Merge pull request #4158 from BSBandme/FixBenchmarks | Yilun Chong | 2018-01-10 | 6 | -62/+60 |
|\ | |||||
| * | Update py_benchmark.py | Yilun Chong | 2018-01-10 | 1 | -1/+1 |
| * | Fix java benchmark to use parser, fix cpp benchmark new arena to use Reset, f... | Yilun Chong | 2018-01-09 | 6 | -61/+59 |
|/ | |||||
* | Merge pull request #4148 from datacompboy/patch-2 | Adam Cozzette | 2018-01-08 | 1 | -0/+53 |
|\ | |||||
| * | Update time_test.cc | Anton Fedorov | 2018-01-05 | 1 | -0/+53 |
* | | Merge pull request #4147 from datacompboy/patch-1 | Adam Cozzette | 2018-01-08 | 1 | -2/+2 |
|\ \ | |||||
| * | | Fix ValidateDateTime: check day instead month | Anton Fedorov | 2018-01-05 | 1 | -2/+2 |
| |/ | |||||
* | | Merge pull request #4132 from BSBandme/JavaCaliperCounter | Yilun Chong | 2018-01-05 | 2 | -12/+64 |
|\ \ | |||||
| * | | Add counter to Java benchmark | Yilun Chong | 2018-01-05 | 2 | -12/+64 |
* | | | Merge pull request #4065 from BSBandme/python_benchmark_real | Yilun Chong | 2018-01-05 | 5 | -8/+284 |
|\ \ \ | |_|/ |/| | | |||||
| * | | Add python benchmark | Yilun Chong | 2018-01-05 | 5 | -8/+284 |
| |/ | |||||
* | | Merge pull request #4131 from pherl/merge | Jisi Liu | 2018-01-04 | 55 | -218/+853 |
|\ \ | |||||
| * \ | Merge remote-tracking branch 'origin/3.5.x' into master | Jisi Liu | 2018-01-03 | 2 | -7/+4 |
| |\ \ | |||||
| | * \ | Merge pull request #4124 from pherl/nullptr | Jisi Liu | 2018-01-03 | 1 | -1/+1 |
| | |\ \ | |||||
| | | * | | remove nullptr | Jisi Liu | 2018-01-02 | 1 | -1/+1 |
| | * | | | Merge pull request #4090 from pherl/nopassword | Jisi Liu | 2018-01-03 | 1 | -6/+3 |
| | |\ \ \ | | | |/ / | | |/| | | |||||
| | | * | | Fix uploading binary wheel. | Jisi Liu | 2017-12-22 | 1 | -6/+3 |
| * | | | | Merge remote-tracking branch 'origin/3.5.x' into master | Jisi Liu | 2018-01-03 | 54 | -212/+850 |
| |\| | | | |||||
| | * | | | Merge pull request #4089 from pherl/nocache | Jisi Liu | 2017-12-22 | 1 | -1/+2 |
| | |\| | | |||||
| | | * | | Disable pip cache when testing uploaded packages | Jisi Liu | 2017-12-22 | 1 | -1/+2 |
| | |/ / | |||||
| | * | | Merge pull request #4073 from pherl/changelogv3.5.1 | Jisi Liu | 2017-12-20 | 1 | -0/+31 |
| | |\ \ | |||||
| | | * | | Update changelog | Jisi Liu | 2017-12-20 | 1 | -1/+1 |
| | | * | | Update changelog | Jisi Liu | 2017-12-19 | 1 | -2/+7 |
| | | * | | Merge branch '3.5.x' of github.com:google/protobuf into changelog | Jisi Liu | 2017-12-19 | 26 | -28/+28 |
| | | |\ \ | |||||
| | | * | | | Update changelog for 3.5.1 | Jisi Liu | 2017-12-19 | 1 | -0/+26 |
| | * | | | | Merge pull request #4080 from pherl/arm64 | Jisi Liu | 2017-12-20 | 1 | -0/+3 |
| | |\ \ \ \ | |||||
| | | * | | | | Add support for Windows ARM64 build | Miradham Kamilov | 2017-12-20 | 1 | -0/+3 |
| | | | |/ / | | | |/| | | |||||
| | * | | | | Merge pull request #4072 from google/jieluo | Jisi Liu | 2017-12-19 | 55 | -769/+4529 |
| | |\ \ \ \ | |||||
| | | * | | | | Cherrypick for csharp, including: | Jie Luo | 2017-12-19 | 55 | -769/+4529 |
| | | | |/ / | | | |/| | | |||||
| | * | | | | Merge pull request #4076 from pherl/stringback | Jisi Liu | 2017-12-19 | 1 | -1/+1 |
| | |\ \ \ \ | | | |_|/ / | | |/| | | | |||||
| | | * | | | Fix string::back() usage in googletest.cc | Jisi Liu | 2017-12-19 | 1 | -1/+1 |
| | |/ / / | |||||
| | * | | | Merge pull request #4074 from pherl/mapat | Jisi Liu | 2017-12-19 | 1 | -1/+1 |
| | |\ \ \ | |||||
| | | * | | | Replace C++11 only method std::map::at | Jisi Liu | 2017-12-19 | 1 | -1/+1 |
| | | |/ / | |||||
| | * | | | Merge pull request #4070 from pherl/3.5.x | Jisi Liu | 2017-12-19 | 25 | -27/+27 |
| | |\ \ \ | | | |/ / | | |/| | | |||||
| | | * | | Update version number to 3.5.1 | Jisi Liu | 2017-12-19 | 25 | -27/+27 |
| | |/ / |