aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Implement JSON parsing in C#.Jon Skeet2015-11-0317-22/+2915
* Merge pull request #930 from pherl/bazel_testJisi Liu2015-11-021-0/+8
|\
| * add warning notes for cc|py_proto_library rules.Jisi Liu2015-11-021-0/+8
* | Merge pull request #931 from xfxyjwf/fix_compileFeng Xiao2015-11-023-3/+4
|\ \ | |/ |/|
| * Fix compilation errors when built internally.Feng Xiao2015-11-023-3/+4
|/
* Merge pull request #929 from jskeet/unsafe-internalJan Tattermusch2015-11-021-3/+3
|\
| * Make BytesString.Unsafe internal (which it should have been all along)Jon Skeet2015-11-021-3/+3
* | Merge pull request #924 from bbarenblat/masterFeng Xiao2015-10-317-7/+7
|\ \ | |/ |/|
| * Correct spellingBenjamin Barenblat2015-10-307-7/+7
|/
* Merge pull request #905 from jskeet/wrapper-clearJan Tattermusch2015-10-303-2/+12
|\
| * Fix clearing wrapper type fields with reflection.Jon Skeet2015-10-303-2/+12
|/
* Merge pull request #922 from randomascii/masterFeng Xiao2015-10-297-70/+72
|\
| * Get VS 2015 to use const int definitionsBruce Dawson2015-10-297-70/+72
|/
* Merge pull request #861 from haberman/pywarningsJoshua Haberman2015-10-2813-139/+138
|\
| * Pass $CC environment variable through tox.Josh Haberman2015-10-281-0/+1
| * Special-case Clang-only warning flags to Clang.Josh Haberman2015-10-282-4/+4
| * Disable some more warnings to be warnings-free.Josh Haberman2015-10-281-1/+2
| * Fixed compile errors after rebase.Josh Haberman2015-10-281-3/+1
| * Removed all warnings from the Python/C++ build.Josh Haberman2015-10-2813-134/+133
|/
* 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