aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #915 from pherl/masterv3.0.0-beta-1-bzl-fixJisi Liu2015-10-272-1/+16
|\
| * add default_runtime attribute to cc|py rules.Jisi Liu2015-10-272-1/+16
|/
* Merge pull request #908 from jskeet/oneof-equalityJan Tattermusch2015-10-248-81/+151
|\
| * Generated code for previous commit (oneof case contributing to hash code and ...Jon Skeet2015-10-246-81/+133
| * Include the oneof-case in equality and hash code generated code.Jon Skeet2015-10-242-0/+18
* | Merge pull request #904 from matthew-wu/masterJisi Liu2015-10-231-1/+1
|\ \ | |/ |/|
| * Change the #include for any.h to use angle brackets instead of quotes, to be ...Matthew Wu2015-10-221-1/+1
|/
* Merge pull request #903 from pherl/bazel_testJisi Liu2015-10-223-7/+39
|\
| * Update comments.Jisi Liu2015-10-221-3/+4
| * fix six package path.Jisi Liu2015-10-222-2/+8
| * Add six as an external dep.Jisi Liu2015-10-223-0/+19
| * Enable python tests with testdata.Jisi Liu2015-10-221-4/+10
* | Merge pull request #901 from pherl/bazel_testJisi Liu2015-10-211-2/+4
|\|
| * Add runfiles to make the protobuf_test pass.Jisi Liu2015-10-211-2/+4
|/
* Merge pull request #900 from pherl/renameJisi Liu2015-10-211-4/+4
|\
| * Rename python and java bazel rules.Jisi Liu2015-10-211-4/+4
* | Merge pull request #899 from pherl/cc_bazelJisi Liu2015-10-211-3/+3
|\ \ | |/ |/|
| * Use && for internal_copied_filegroup.Jisi Liu2015-10-211-3/+3
|/
* Merge pull request #867 from pherl/masterJisi Liu2015-10-212-46/+299
|\
| * avoid name duplication.Jisi Liu2015-10-201-1/+1
| * Rename copeid_src to internal_copied_filegroupJisi Liu2015-10-202-10/+10
| * Uncomment objc testsJisi Liu2015-10-201-7/+9
| * fix sources for python target and add needed dependencies.Jisi Liu2015-10-201-3/+3
| * Change the impl rule include to includes.Jisi Liu2015-10-202-19/+29
| * Change default value of protoc on xx_proto_library rules.Jisi Liu2015-10-202-4/+14
| * Support python for bazel.Jisi Liu2015-10-192-3/+54
| * Python bazel support.Jisi Liu2015-10-192-34/+214
* | Merge pull request #869 from anandolee/masterJie Luo2015-10-204-11/+27
|\ \
| * | fix json_format for python2.6:Jie Luo2015-10-194-11/+27
* | | Merge pull request #892 from pherl/cc_bazelJisi Liu2015-10-191-2/+8
|\ \ \ | | |/ | |/|
| * | Allow include to be None.Jisi Liu2015-10-191-2/+8
* | | Merge pull request #889 from leif81/patch-1Feng Xiao2015-10-161-10/+10
|\ \ \
| * | | Change back to "protobuf_BUILD_TESTS" flagLeif Gruenwoldt2015-10-161-1/+1
| * | | Fix typos in cmake README.mdLeif Gruenwoldt2015-10-161-11/+11
* | | | 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