aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* make protobuf_MSVC_STATIC_RUNTIME a dependent option to reflect it's use.Walter Gray2016-06-091-1/+3
* Save the relevant options used to create a package, allow users to reject pac...Walter Gray2016-06-092-11/+20
* Add GOOGLE_ prefix before PROTOBUF_DEPRECATED_ATTRBo Yang2016-06-073-3/+3
* Fix the undefined behavior for opensource users.Bo Yang2016-06-071-3/+5
* Merge pull request #1624 from yeswalrus/cmake-prerelease-versioningFeng Xiao2016-06-072-17/+30
|\
| * For prerelease versions, require protobuf_FIND_VERSION to be set.Walter Gray2016-05-311-16/+22
| * Include the prerelease version in the protobuf_VERSIONWalter Gray2016-05-311-1/+8
* | Merge pull request #1643 from yeswalrus/cmake-examplesFeng Xiao2016-06-078-76/+335
|\ \
| * | Replace handwritten protobuf-targets with exported version.Walter Gray2016-06-063-39/+24
| * | Use ExternalProject_Add to build the examples in a stand-alone fashion.Walter Gray2016-06-062-62/+93
| * | CMake project updatesKonstantin Podsvirov2016-06-049-69/+312
* | | Merge pull request #1541 from haberman/conformancestrictJoshua Haberman2016-06-0612-163/+155
|\ \ \ | |/ / |/| |
| * | Make surrogate regex even more lenient.Josh Haberman2016-06-061-2/+2
| * | JSON surrogates Python: adjust regex for OSX error message.Josh Haberman2016-06-061-2/+2
| * | Added test for surrogates (valid and invalid).Josh Haberman2016-06-031-0/+21
| * | Added update_failure_list.py.Josh Haberman2016-06-031-0/+73
| * | Surrogate checking is unpredictable, so always manually check.Josh Haberman2016-06-032-24/+6
| * | Fixed Python by updating failure lists and fixed a few broken tests.Josh Haberman2016-06-035-83/+28
| * | Make conformance tests more strict about the failure list.Josh Haberman2016-06-035-80/+51
|/ /
* | Integrate interanl changesBo Yang2016-06-021-0/+1
* | Improving the granularity parsing errors (#1623)Sergio Campamá2016-06-025-42/+223
* | Merge pull request #1640 from os72/masterFeng Xiao2016-06-021-0/+1
|\ \
| * | Add https://github.com/os72/protobuf-dynamicos722016-05-311-0/+1
|/ /
* | Merge pull request #1625 from yeswalrus/note-versionsFeng Xiao2016-05-311-2/+7
|\ \
| * | Update the list of places where the version is stored.Walter Gray2016-05-281-2/+7
* | | Merge pull request #1613 from yeswalrus/cmake-min-versionFeng Xiao2016-05-311-1/+1
|\ \ \ | |_|/ |/| |
| * | Bump to the *real* minimum required version. Setting CMP0022 breaks CMake ver...Walter Gray2016-05-261-1/+1
* | | Merge pull request #1629 from zhongfq/patch-1Feng Xiao2016-05-311-0/+1
|\ \ \
| * | | add protobuf as3 lib and code generator for as3Eric Zhong2016-05-301-0/+1
| | |/ | |/|
* | | Merge pull request #1614 from yeswalrus/cmake-cleanupFeng Xiao2016-05-312-37/+27
|\ \ \
| * | | Remove __PROTOBUF_PACKAGE_PREFIXWalter Gray2016-05-281-5/+1
| * | | remove useless cleanup - config.cmake files are executed in their own context.Walter Gray2016-05-261-4/+0
| * | | Remove if(TRUE)Walter Gray2016-05-261-28/+26
| | |/ | |/|
* | | Merge pull request #1630 from google/beta-3Thomas Van Lenten2016-05-311-1/+1
|\ \ \
| * \ \ Merge pull request #1561 from pherl/beta-3Thomas Van Lenten2016-05-181-1/+1
| |\ \ \
| | * | | Bump objc podspec version numberJisi Liu2016-05-181-1/+1
| |/ / /
* | | | Merge pull request #1620 from sergiocampama/cleanup1Thomas Van Lenten2016-05-302-12/+0
|\ \ \ \ | |_|_|/ |/| | |
| * | | Removing unused GPBExceptionMessageKeySergio Campama2016-05-272-12/+0
* | | | Merge pull request #1617 from thomasvl/more_warningsThomas Van Lenten2016-05-276-172/+249
|\ \ \ \ | |/ / / |/| | |
| * | | Add -Woverriding-method-mismatch.Thomas Van Lenten2016-05-276-172/+249
* | | | Merge pull request #1604 from jonwallg/repeated_typesThomas Van Lenten2016-05-272-2/+29
|\ \ \ \ | |/ / / |/| | |
| * | | fix expected class checking in GPBSetMessageRepeatedFieldJon Wall2016-05-262-2/+29
|/ / /
* | | Merge pull request #1600 from thomasvl/objc_tighter_warningsThomas Van Lenten2016-05-2623-32/+269
|\ \ \
| * | | Add more warnings to for the ObjC runtime buildThomas Van Lenten2016-05-2523-32/+269
* | | | Merge pull request #1586 from davidzchen/pythonJisi Liu2016-05-252-14/+76
|\ \ \ \ | |/ / / |/| | |
| * | | Bazel build: Keep generated sources and Python runtime in the same directory.David Z. Chen2016-05-252-14/+76
* | | | Merge pull request #1595 from thomasvl/objc_travis_tweaksThomas Van Lenten2016-05-253-79/+84
|\ \ \ \
| * | | | Automated testing tweaks for ObjCThomas Van Lenten2016-05-243-79/+84
| | |_|/ | |/| |
* | | | Merge pull request #1593 from thomasvl/framework_includesThomas Van Lenten2016-05-2428-95/+543
|\ \ \ \
| * | | | Better support for using the proto library from a framework.Thomas Van Lenten2016-05-2428-95/+543
| |/ / /