aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* 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
| |/ / /
* | | | Merge pull request #1589 from hochhaus/masterJoshua Haberman2016-05-241-0/+1
|\ \ \ \ | |/ / / |/| | |
| * | | Add js/binary/encoder.js to js_EXTRA_DIST.Andy Hochhaus2016-05-221-0/+1
* | | | Merge pull request #1588 from jeffmvr/masterFeng Xiao2016-05-221-1/+1
|\ \ \ \ | |/ / / |/| | |
| * | | added missing closing bracket for _cmakedir_desc in cmake/install.cmake line 88Jeff Merver2016-05-211-1/+1
|/ / /
* | | Merge pull request #1578 from wal-rus/cmake-install-namespaceFeng Xiao2016-05-201-0/+1
|\ \ \ | |/ / |/| |
| * | add protobuf:: namespace to installed targetsWalter Gray2016-05-201-0/+1
|/ /
* | Merge pull request #1523 from xfxyjwf/compatibility_testsFeng Xiao2016-05-2078-0/+19521
|\ \
| * | Describe platform requirements for the compatibility tests.Feng Xiao2016-05-201-0/+4
| * | Add compatiblity tests against v2.5.0Feng Xiao2016-05-1778-0/+19517
* | | Merge pull request #1583 from thomasvl/pods_integration_followupThomas Van Lenten2016-05-205-14/+36
|\ \ \
| * | | Make the CocoaPods integration tests more robustThomas Van Lenten2016-05-205-14/+36
* | | | Merge pull request #1576 from wal-rus/cmake-versionfileFeng Xiao2016-05-201-0/+35
|\ \ \ \
| * | | | Update protobuf-config-version.cmake.in to correctly set the required variabl...Walter Gray2016-05-191-0/+35
| |/ / /
* | | | Merge pull request #1575 from wal-rus/cmake-install-msvcFeng Xiao2016-05-201-2/+8
|\ \ \ \ | |/ / / |/| | |
| * | | Fix the cmake configuration file install path to be more standards compliant ...Walter Gray2016-05-191-2/+8
|/ / /
* | | Merge pull request #1574 from thomasvl/test_schemesThomas Van Lenten2016-05-192-0/+182
|\ \ \
| * | | Add shared schemes for the CocoaPods integration testsThomas Van Lenten2016-05-192-0/+182
|/ / /
* | | Merge pull request #1572 from thomasvl/podspec_tests_2Thomas Van Lenten2016-05-1925-7/+2091
|\ \ \