aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
* | | | Merge pull request #783 from podsvirov/topic-cmake-projectFeng Xiao2015-10-168-57/+116
|\ \ \ \
| * | | | Improved SHARED build from CMake projectKonstantin Podsvirov2015-10-156-29/+50
| * | | | Add CMake option protobuf_DEBUG_POSTFIXKonstantin Podsvirov2015-09-174-3/+8
| * | | | Simplify testing from CMake project to "check" targetKonstantin Podsvirov2015-09-172-25/+17
| * | | | Improved testing from CMake projectKonstantin Podsvirov2015-09-161-4/+11
| * | | | Rename CMake option BUILD_SHARED_LIBS to protobuf_BUILD_SHARED_LIBSKonstantin Podsvirov2015-09-151-4/+4
| * | | | Rename CMake option ZLIB to protobuf_WITH_ZLIBKonstantin Podsvirov2015-09-151-5/+5
| * | | | Rename CMake option BUILD_TESTING to protobuf_BUILD_TESTSKonstantin Podsvirov2015-09-151-3/+3
| * | | | Improved testing from CMake projectKonstantin Podsvirov2015-09-152-3/+17
| * | | | Using NEW behavior for CMP0022 in CMake projectKonstantin Podsvirov2015-09-011-0/+3
| * | | | Option for switching static runtime link policy with MSVCKonstantin Podsvirov2015-09-011-7/+10
| * | | | Using find_package(ZLIB) with MSVC tooKonstantin Podsvirov2015-08-311-12/+14
| * | | | Improved configure.ac parsingKonstantin Podsvirov2015-08-311-15/+27
* | | | | Merge pull request #883 from pherl/cc_bazelJisi Liu2015-10-162-25/+151
|\ \ \ \ \ | |_|/ / / |/| | / / | | |/ / | |/| |
| * | | Change prefix to include, and add docsJisi Liu2015-10-162-12/+29
| * | | Rename deps/proto_deps to cc_libs/depsJisi Liu2015-10-162-10/+8
| * | | style/naming fixJisi Liu2015-10-151-9/+11
| * | | make cc_out and py_out internal.Jisi Liu2015-10-141-3/+3
| * | | Format code.Jisi Liu2015-10-141-34/+34
| * | | buildifier the fileJisi Liu2015-10-141-11/+14
| * | | Extract protoc action into .bzl for cc.Jisi Liu2015-10-142-25/+131
|/ / /
* | | Merge pull request #824 from jtattermusch/expose_get_output_fileJan Tattermusch2015-10-144-39/+58
|\ \ \
| * | | expose GetOutputFile in csharp_names.hJan Tattermusch2015-09-234-39/+58
* | | | Merge pull request #875 from tkarls/return_correct_bool_type_from_mapFeng Xiao2015-10-131-1/+1
|\ \ \ \
| * | | | Changed return type from int32 to bool in function returning a boolThomas Karlsson2015-10-131-1/+1
| | |_|/ | |/| |
* | | | Merge pull request #878 from matthewvalimaki/autogen-optionsFeng Xiao2015-10-131-1/+13
|\ \ \ \
| * | | | Add support for arguments.Matthew Valimaki2015-10-131-1/+13
| |/ / /
* | | | Merge pull request #876 from tkarls/use_correct_int_type_in_set_functionFeng Xiao2015-10-131-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Changed argument typ to uint32 in set function that sets an uint32 valueThomas Karlsson2015-10-131-1/+1
|/ / /
* | | Merge pull request #815 from TeBoring/third-partyPaul Yang2015-10-0915-348/+37
|\ \ \
| * | | Down-integrate internal bug fixing changes.Bo Yang2015-10-0415-348/+37
* | | | Merge pull request #822 from podsvirov/topic-cmake-readmeFeng Xiao2015-10-091-76/+272
|\ \ \ \
| * | | | Update cmake/README.md for #783 PRKonstantin Podsvirov2015-10-091-76/+272
|/ / / /
* | | | Merge pull request #866 from Sahloul/patch-1Feng Xiao2015-10-081-1/+1
|\ \ \ \
| * | | | Use static castHamdi Sahloul2015-10-091-1/+1
| * | | | VS2010 compatibility of address initalizationHamdi Sahloul2015-10-091-1/+1
* | | | | Merge pull request #856 from mzhaom/bazel-buildJisi Liu2015-10-081-0/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Add missing csharp_doc_comment.cc to protoc_lib.Ming Zhao2015-10-071-0/+1
|/ / / /
* | | | Merge pull request #846 from jskeet/tostringJon Skeet2015-10-075-115/+203
|\ \ \ \
| * | | | Support ToString in RepeatedField and MapField.Jon Skeet2015-10-015-115/+203
* | | | | Merge pull request #860 from pherl/masterJisi Liu2015-10-071-8/+10
|\ \ \ \ \
| * | | | | add complete WKT for python.Jisi Liu2015-10-061-4/+8
| * | | | | Generate well known types for python.Jisi Liu2015-10-061-8/+6
|/ / / / /
* | | | | Merge pull request #849 from pherl/masterJisi Liu2015-10-06107-878/+3322
|\ \ \ \ \
| * | | | | Remove duplicated header fileJisi Liu2015-10-061-218/+0
| * | | | | Revert unwanted changes.Jisi Liu2015-10-062-35/+35
| * | | | | remove extra collection importJisi Liu2015-10-061-1/+0
| * | | | | disable tests for python-cpp under py26 as well.Jisi Liu2015-10-062-3/+4
| * | | | | disable py2.6 tests for json_format_testJisi Liu2015-10-052-2/+4
| * | | | | Revert back changes to import unittest2 for py26Jisi Liu2015-10-0516-26/+64