aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* v3.0.0-beta-1.1 for python.v3.0.0-beta-1.1Feng Xiao2015-12-161-1/+1
* Remove the usage of C++11 override.Feng Xiao2015-12-141-2/+2
* Add new files to Makefile.amFeng Xiao2015-12-141-24/+36
* Down-integrate from internal code base.Feng Xiao2015-12-11225-4970/+26872
* Merge pull request #1041 from thomasvl/use_xc7Thomas Van Lenten2015-12-1113-44/+80
|\
| * Update the min toolchain for iOS/OS X to be Xcode 7Thomas Van Lenten2015-12-1013-44/+80
|/
* Merge pull request #1039 from thomasvl/fix_cleansThomas Van Lenten2015-12-102-0/+2
|\
| * Fix dist_clean and maintainer-clean to get more generated files.Thomas Van Lenten2015-12-102-0/+2
|/
* Merge pull request #1029 from keveman/masterJoshua Haberman2015-12-108-7/+91
|\
| * Bringing in internal::shared_ptr into google:protobuf namespace.Manjunath Kudlur2015-12-096-0/+12
| * Made targets relative to google/protobufManjunath Kudlur2015-12-081-4/+4
| * Added util/python/BUILD to provide //util/python:python_headers dependency fo...Manjunath Kudlur2015-12-081-0/+8
| * Made building the python extension configurable via --define=use_fast_cpp_pro...Manjunath Kudlur2015-12-081-7/+24
| * Updated for c++98 compatibilityManjunath Kudlur2015-12-076-5/+12
| * Enable fast cpp protos in the python interface.Manjunath Kudlur2015-12-077-13/+53
* | Merge pull request #1025 from Yangqing/masterFeng Xiao2015-12-091-47/+38
|\ \
| * | Minor changes to match the internal versionYangqing Jia2015-12-091-6/+7
| * | Arena type traits standardization.Yangqing Jia2015-12-051-47/+37
* | | Merge pull request #1033 from c0nk/wip-implicit-cast-fixFeng Xiao2015-12-091-1/+1
|\ \ \
| * | | Fix narrowing implicit cast in generated message [NFC]Kal Conley2015-12-081-1/+1
| | |/ | |/|
* | | Merge pull request #1030 from TeBoring/sandboxPaul Yang2015-12-0819-79/+91
|\ \ \
| * | | Use angle bracket for well known type proto header.Bo Yang2015-12-0819-79/+91
* | | | Merge pull request #1034 from thomasvl/static_assert_fixThomas Van Lenten2015-12-081-4/+9
|\ \ \ \ | |_|/ / |/| | |
| * | | Use compiler provided static assert and avoid tripping unused-local-typedef w...Thomas Van Lenten2015-12-081-4/+9
|/ / /
* | | Merge pull request #1027 from thomasvl/more_nullable_supportThomas Van Lenten2015-12-078-53/+156
|\ \ \ | |_|/ |/| |
| * | Enable CLANG_WARN_NULLABLE_TO_NONNULL_CONVERSION for the projects.Thomas Van Lenten2015-12-078-53/+156
|/ /
* | Merge pull request #1024 from martinmaly/wktJisi Liu2015-12-051-0/+3
|\ \
| * | Making _genproto rules public.Martin Maly2015-12-041-0/+3
* | | Merge pull request #1022 from haberman/python-conformance2Joshua Haberman2015-12-048-5/+186
|\ \ \ | |/ / |/| |
| * | Remove all bare strings as exceptions.Josh Haberman2015-12-041-3/+6
| * | Added Python failure lists, and fixes to make sure failure propagates.Josh Haberman2015-12-034-1/+33
| * | Added JSON support to Python conformance tests.Josh Haberman2015-12-021-3/+8
| * | Conformance test implementation for Python.Josh Haberman2015-12-025-5/+146
* | | Merge pull request #1023 from girving/py3Joshua Haberman2015-12-042-0/+3
|\ \ \ | |_|/ |/| |
| * | Add srcs_version = "PY2AND3" in BUILD filesGeoffrey Irving2015-12-032-0/+3
|/ /
* | Merge pull request #1014 from damienmg/masterJisi Liu2015-12-031-0/+5
|\ \
| * | Fix headers for gmock.BUILDDamien Martin-Guillerez2015-12-011-0/+5
* | | Merge pull request #1021 from thomasvl/fix_err_msgThomas Van Lenten2015-12-0212-12/+12
|\ \ \
| * | | Tweak the error message as the generate is in the core binary these days.Thomas Van Lenten2015-12-0212-12/+12
|/ / /
* | | Merge pull request #1020 from thomasvl/block_nilThomas Van Lenten2015-12-021-5/+136
|\ \ \ | |_|/ |/| |
| * | Check and throw errors for nil values/keys (like NSDictionary).Thomas Van Lenten2015-12-021-5/+136
* | | Merge pull request #1019 from thomasvl/correct_conformance_compileThomas Van Lenten2015-12-022-2/+8
|\ \ \ | |/ / |/| |
| * | Ensure the conformance build of objc code is using the Mac OS X SDK andThomas Van Lenten2015-12-022-2/+8
|/ /
* | Merge pull request #1000 from jskeet/any-formatJon Skeet2015-12-026-525/+894
|\ \
| * | Handle JSON parsing for Any.Jon Skeet2015-12-025-509/+761
| * | JSON formatting for Any.Jon Skeet2015-12-022-18/+135
|/ /
* | Merge pull request #1016 from tswast/tutorial-regionsFeng Xiao2015-12-011-3/+17
|\ \ | |/ |/|
| * Add region tags for protocol buffers tutorials.Tim Swast2015-12-011-3/+17
|/
* Merge pull request #998 from tswast/goexampleFeng Xiao2015-11-308-0/+410
|\
| * Add a Go language example.Tim Swast2015-11-258-0/+410
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-15 03:59:05 +0000