Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | Merge pull request #4439 from acozzette/remove-atomicops-stub | Adam Cozzette | 2018-03-27 | 2 | -238/+1 | |
|\ \ \ \ | ||||||
| * | | | | Updated .gitignore to exclude downloaded gmock/ directory | Adam Cozzette | 2018-03-27 | 1 | -1/+1 | |
| * | | | | Removed atomicops.h since it is no longer used | Adam Cozzette | 2018-03-27 | 1 | -237/+0 | |
|/ / / / | ||||||
* | | | | Merge pull request #3794 from jskeet/reflection | Jan Tattermusch | 2018-03-27 | 4 | -40/+166 | |
|\ \ \ \ | ||||||
| * | | | | Address review comments | Jon Skeet | 2018-03-27 | 1 | -5/+13 | |
| * | | | | Add extra C# file to Makefile.am | Jon Skeet | 2018-03-27 | 1 | -0/+1 | |
| * | | | | Work around an "old runtime" issue with reflection | Jon Skeet | 2018-03-27 | 1 | -5/+51 | |
| * | | | | Introduce a compatiblity shim to support .NET 3.5 delegate creation | Jon Skeet | 2018-03-27 | 2 | -0/+51 | |
| * | | | | Change C# reflection to avoid using expression trees | Jon Skeet | 2018-03-27 | 2 | -34/+54 | |
|/ / / / | ||||||
* | | | | Merge pull request #4432 from xfxyjwf/rmnanokokoro | Feng Xiao | 2018-03-26 | 6 | -78/+0 | |
|\ \ \ \ | ||||||
| * | | | | Delete javanano kokoro build configs. | Feng Xiao | 2018-03-26 | 6 | -78/+0 | |
| |/ / / | ||||||
* | | | | Merge pull request #4434 from xfxyjwf/buildstatus | Feng Xiao | 2018-03-26 | 1 | -1/+1 | |
|\ \ \ \ | |/ / / |/| | | | ||||||
| * | | | Remove broken build status icons. | Feng Xiao | 2018-03-26 | 1 | -1/+1 | |
|/ / / | ||||||
* | | | Include googletest as a submodule (#3993) | Carlos O'Ryan | 2018-03-26 | 16 | -120/+82 | |
* | | | source code info for interpreted options; fix source code info for extension ... | Joshua Humphries | 2018-03-26 | 4 | -68/+748 | |
* | | | Merge pull request #4431 from xfxyjwf/rmnano | Feng Xiao | 2018-03-26 | 69 | -17060/+11 | |
|\ \ \ | ||||||
| * | | | Remove javanano. | Feng Xiao | 2018-03-26 | 69 | -17060/+14 | |
* | | | | Fixes MSVC compiler warning C4800 "Forcing value to bool 'true' or 'false'" (... | Alexey Malov | 2018-03-26 | 2 | -2/+2 | |
* | | | | Merge pull request #4395 from stone4774/fixbug_enum2json2 | Feng Xiao | 2018-03-26 | 5 | -17/+66 | |
|\ \ \ \ | ||||||
| * \ \ \ | Merge branch 'master' into fixbug_enum2json2 | stone4774 | 2018-03-22 | 339 | -14979/+19144 | |
| |\ \ \ \ | | | |/ / | | |/| | | ||||||
| * | | | | Use the first enum value instead of 0 in DefaultValueObjectWriter::FindEnumDe... | stone4774 | 2018-03-21 | 1 | -1/+1 | |
| * | | | | Fix bug: whether always_print_enums_as_ints is true or false, it always print... | stone4774 | 2018-03-19 | 5 | -17/+66 | |
* | | | | | Merge pull request #4424 from egorpugin/patch-1 | Feng Xiao | 2018-03-26 | 1 | -3/+6 | |
|\ \ \ \ \ | ||||||
| * | | | | | Fix missing LIBPROTOC_EXPORT. | Egor Pugin | 2018-03-25 | 1 | -3/+6 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #4413 from pmuetschard/msvc | Adam Cozzette | 2018-03-23 | 1 | -13/+6 | |
|\ \ \ \ \ | ||||||
| * | | | | | Don't assume Windows builds use MSVC. | Pascal Muetschard | 2018-03-22 | 1 | -13/+6 | |
| | |/ / / | |/| | | | ||||||
* | | | | | Merge pull request #4422 from acozzette/ruby-conformance | Adam Cozzette | 2018-03-23 | 1 | -0/+2 | |
|\ \ \ \ \ | ||||||
| * | | | | | Updated Ruby conformance test failure list | Adam Cozzette | 2018-03-23 | 1 | -0/+2 | |
* | | | | | | Merge pull request #4421 from acozzette/fix-bazel-build | Adam Cozzette | 2018-03-23 | 1 | -0/+3 | |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | ||||||
| * | | | | | Added missing .inc files to BUILD | Adam Cozzette | 2018-03-23 | 1 | -0/+3 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #4346 from BSBandme/performance_result | Yilun Chong | 2018-03-22 | 2 | -1/+318 | |
|\ \ \ \ \ | |_|_|/ / |/| | | | | ||||||
| * | | | | Add performance.md and add instruction for linking tcmalloc | Yilun Chong | 2018-03-22 | 2 | -1/+318 | |
* | | | | | Merge pull request #4412 from acozzette/remove-old-files | Adam Cozzette | 2018-03-22 | 24 | -4907/+2 | |
|\ \ \ \ \ | |_|/ / / |/| | | | | ||||||
| * | | | | Removed some unused C++ source files | Adam Cozzette | 2018-03-22 | 24 | -4907/+2 | |
|/ / / / | ||||||
* | | | | Merge pull request #4387 from acozzette/down-integrate | Adam Cozzette | 2018-03-20 | 312 | -14342/+15463 | |
|\ \ \ \ | ||||||
| * | | | | Removed unused variables in repeated_scalar_container.cc | Adam Cozzette | 2018-03-20 | 1 | -12/+0 | |
| * | | | | Try using a new version of Visual Studio on AppVeyor | Adam Cozzette | 2018-03-20 | 1 | -2/+3 | |
| * | | | | Removed unused code pertaining to shared_ptr | Adam Cozzette | 2018-03-20 | 1 | -7/+0 | |
| * | | | | Updated conformance failure lists | Adam Cozzette | 2018-03-20 | 3 | -3/+0 | |
| * | | | | Added map_lite_test.proto to fix LiteTest | Adam Cozzette | 2018-03-20 | 3 | -0/+113 | |
| * | | | | Added pyext/thread_unsafe_shared_ptr.h | Adam Cozzette | 2018-03-20 | 2 | -0/+105 | |
| * | | | | Removed unrecognized option from no_package.proto | Adam Cozzette | 2018-03-20 | 1 | -3/+1 | |
| * | | | | Added new test source files to Makefile.am | Adam Cozzette | 2018-03-20 | 1 | -0/+4 | |
| * | | | | Removed use of some type traits | Adam Cozzette | 2018-03-20 | 3 | -5/+5 | |
| * | | | | Include no_package.proto in Python test | Adam Cozzette | 2018-03-14 | 2 | -0/+2 | |
| * | | | | Deleted scoped_ptr.h | Adam Cozzette | 2018-03-14 | 27 | -311/+49 | |
| * | | | | Updated checked-in generated code | Adam Cozzette | 2018-03-14 | 2 | -4/+4 | |
| * | | | | Fixed up proto3_lite_unittest.cc | Adam Cozzette | 2018-03-14 | 1 | -11/+11 | |
| * | | | | Merge branch 'master' into down-integrate | Adam Cozzette | 2018-03-13 | 33 | -697/+3583 | |
| |\ \ \ \ | ||||||
| * | | | | | Integrated internal changes from Google | Adam Cozzette | 2018-03-13 | 282 | -14041/+15223 |