Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | Merge pull request #783 from podsvirov/topic-cmake-project | Feng Xiao | 2015-10-16 | 8 | -57/+116 | |
|\ \ \ \ | ||||||
| * | | | | Improved SHARED build from CMake project | Konstantin Podsvirov | 2015-10-15 | 6 | -29/+50 | |
| * | | | | Add CMake option protobuf_DEBUG_POSTFIX | Konstantin Podsvirov | 2015-09-17 | 4 | -3/+8 | |
| * | | | | Simplify testing from CMake project to "check" target | Konstantin Podsvirov | 2015-09-17 | 2 | -25/+17 | |
| * | | | | Improved testing from CMake project | Konstantin Podsvirov | 2015-09-16 | 1 | -4/+11 | |
| * | | | | Rename CMake option BUILD_SHARED_LIBS to protobuf_BUILD_SHARED_LIBS | Konstantin Podsvirov | 2015-09-15 | 1 | -4/+4 | |
| * | | | | Rename CMake option ZLIB to protobuf_WITH_ZLIB | Konstantin Podsvirov | 2015-09-15 | 1 | -5/+5 | |
| * | | | | Rename CMake option BUILD_TESTING to protobuf_BUILD_TESTS | Konstantin Podsvirov | 2015-09-15 | 1 | -3/+3 | |
| * | | | | Improved testing from CMake project | Konstantin Podsvirov | 2015-09-15 | 2 | -3/+17 | |
| * | | | | Using NEW behavior for CMP0022 in CMake project | Konstantin Podsvirov | 2015-09-01 | 1 | -0/+3 | |
| * | | | | Option for switching static runtime link policy with MSVC | Konstantin Podsvirov | 2015-09-01 | 1 | -7/+10 | |
| * | | | | Using find_package(ZLIB) with MSVC too | Konstantin Podsvirov | 2015-08-31 | 1 | -12/+14 | |
| * | | | | Improved configure.ac parsing | Konstantin Podsvirov | 2015-08-31 | 1 | -15/+27 | |
* | | | | | Merge pull request #883 from pherl/cc_bazel | Jisi Liu | 2015-10-16 | 2 | -25/+151 | |
|\ \ \ \ \ | |_|/ / / |/| | / / | | |/ / | |/| | | ||||||
| * | | | Change prefix to include, and add docs | Jisi Liu | 2015-10-16 | 2 | -12/+29 | |
| * | | | Rename deps/proto_deps to cc_libs/deps | Jisi Liu | 2015-10-16 | 2 | -10/+8 | |
| * | | | style/naming fix | Jisi Liu | 2015-10-15 | 1 | -9/+11 | |
| * | | | make cc_out and py_out internal. | Jisi Liu | 2015-10-14 | 1 | -3/+3 | |
| * | | | Format code. | Jisi Liu | 2015-10-14 | 1 | -34/+34 | |
| * | | | buildifier the file | Jisi Liu | 2015-10-14 | 1 | -11/+14 | |
| * | | | Extract protoc action into .bzl for cc. | Jisi Liu | 2015-10-14 | 2 | -25/+131 | |
|/ / / | ||||||
* | | | Merge pull request #824 from jtattermusch/expose_get_output_file | Jan Tattermusch | 2015-10-14 | 4 | -39/+58 | |
|\ \ \ | ||||||
| * | | | expose GetOutputFile in csharp_names.h | Jan Tattermusch | 2015-09-23 | 4 | -39/+58 | |
* | | | | Merge pull request #875 from tkarls/return_correct_bool_type_from_map | Feng Xiao | 2015-10-13 | 1 | -1/+1 | |
|\ \ \ \ | ||||||
| * | | | | Changed return type from int32 to bool in function returning a bool | Thomas Karlsson | 2015-10-13 | 1 | -1/+1 | |
| | |_|/ | |/| | | ||||||
* | | | | Merge pull request #878 from matthewvalimaki/autogen-options | Feng Xiao | 2015-10-13 | 1 | -1/+13 | |
|\ \ \ \ | ||||||
| * | | | | Add support for arguments. | Matthew Valimaki | 2015-10-13 | 1 | -1/+13 | |
| |/ / / | ||||||
* | | | | Merge pull request #876 from tkarls/use_correct_int_type_in_set_function | Feng Xiao | 2015-10-13 | 1 | -1/+1 | |
|\ \ \ \ | |/ / / |/| | | | ||||||
| * | | | Changed argument typ to uint32 in set function that sets an uint32 value | Thomas Karlsson | 2015-10-13 | 1 | -1/+1 | |
|/ / / | ||||||
* | | | Merge pull request #815 from TeBoring/third-party | Paul Yang | 2015-10-09 | 15 | -348/+37 | |
|\ \ \ | ||||||
| * | | | Down-integrate internal bug fixing changes. | Bo Yang | 2015-10-04 | 15 | -348/+37 | |
* | | | | Merge pull request #822 from podsvirov/topic-cmake-readme | Feng Xiao | 2015-10-09 | 1 | -76/+272 | |
|\ \ \ \ | ||||||
| * | | | | Update cmake/README.md for #783 PR | Konstantin Podsvirov | 2015-10-09 | 1 | -76/+272 | |
|/ / / / | ||||||
* | | | | Merge pull request #866 from Sahloul/patch-1 | Feng Xiao | 2015-10-08 | 1 | -1/+1 | |
|\ \ \ \ | ||||||
| * | | | | Use static cast | Hamdi Sahloul | 2015-10-09 | 1 | -1/+1 | |
| * | | | | VS2010 compatibility of address initalization | Hamdi Sahloul | 2015-10-09 | 1 | -1/+1 | |
* | | | | | Merge pull request #856 from mzhaom/bazel-build | Jisi Liu | 2015-10-08 | 1 | -0/+1 | |
|\ \ \ \ \ | |/ / / / |/| | | | | ||||||
| * | | | | Add missing csharp_doc_comment.cc to protoc_lib. | Ming Zhao | 2015-10-07 | 1 | -0/+1 | |
|/ / / / | ||||||
* | | | | Merge pull request #846 from jskeet/tostring | Jon Skeet | 2015-10-07 | 5 | -115/+203 | |
|\ \ \ \ | ||||||
| * | | | | Support ToString in RepeatedField and MapField. | Jon Skeet | 2015-10-01 | 5 | -115/+203 | |
* | | | | | Merge pull request #860 from pherl/master | Jisi Liu | 2015-10-07 | 1 | -8/+10 | |
|\ \ \ \ \ | ||||||
| * | | | | | add complete WKT for python. | Jisi Liu | 2015-10-06 | 1 | -4/+8 | |
| * | | | | | Generate well known types for python. | Jisi Liu | 2015-10-06 | 1 | -8/+6 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #849 from pherl/master | Jisi Liu | 2015-10-06 | 107 | -878/+3322 | |
|\ \ \ \ \ | ||||||
| * | | | | | Remove duplicated header file | Jisi Liu | 2015-10-06 | 1 | -218/+0 | |
| * | | | | | Revert unwanted changes. | Jisi Liu | 2015-10-06 | 2 | -35/+35 | |
| * | | | | | remove extra collection import | Jisi Liu | 2015-10-06 | 1 | -1/+0 | |
| * | | | | | disable tests for python-cpp under py26 as well. | Jisi Liu | 2015-10-06 | 2 | -3/+4 | |
| * | | | | | disable py2.6 tests for json_format_test | Jisi Liu | 2015-10-05 | 2 | -2/+4 | |
| * | | | | | Revert back changes to import unittest2 for py26 | Jisi Liu | 2015-10-05 | 16 | -26/+64 |