aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* 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
|\ \
| * | CocoaPod Integration TestsThomas Van Lenten2016-05-1923-0/+2063
| * | Expand the OS X/Xcode gitignoresThomas Van Lenten2016-05-192-7/+28
* | | Merge pull request #1558 from haberman/rubyoneofJoshua Haberman2016-05-193-24/+59
|\ \ \ | |/ / |/| |
| * | Fixed oneof behavior for enums and fixed JRuby.Josh Haberman2016-05-183-11/+24
| * | Ruby oneofs: return default instead of nil for unset fields.Josh Haberman2016-05-182-20/+42
* | | Merge pull request #1549 from xyzzyz/arena_exportJoshua Haberman2016-05-181-1/+1
|\ \ \
| * | | Export class Arena to shared library.Adam Michalik2016-05-171-1/+1
| | |/ | |/|
* | | Merge pull request #1547 from xyzzyz/js_generatorJoshua Haberman2016-05-181-1/+1
|\ \ \
| * | | Fix #include in js_generator.ccAdam Michalik2016-05-171-1/+1
| |/ /
* | | Merge pull request #1559 from google/beta-3Jisi Liu2016-05-182-1/+2
|\ \ \ | |_|/ |/| |
| * | Merge pull request #1551 from pherl/beta-3Jisi Liu2016-05-171-1/+1
| |\ \
| | * | Fix protoc artifact pom versionJisi Liu2016-05-171-1/+1
| * | | Merge pull request #1546 from pherl/beta-3Jisi Liu2016-05-171-0/+1
| |\| |
| | * | Added download_url to be able to upload to pypi.Jisi Liu2016-05-171-0/+1
| |/ /
* | | Merge pull request #1412 from google/internalPaul Yang2016-05-182-1/+2
|\ \ \
| * | | Integrate interanl changesBo Yang2016-05-182-1/+2
|/ / /
* | | Merge pull request #1548 from anandolee/masterJoshua Haberman2016-05-172-1/+22
|\ \ \ | |_|/ |/| |
| * | JSON format for Any message must print @type first, use OrderedDict instead o...Jie Luo2016-05-172-1/+22
* | | Merge pull request #1542 from google/beta-3Jisi Liu2016-05-1616-23/+206
|\ \ \ | | |/ | |/|
| * | Merge pull request #1540 from pherl/changelogv3.0.0-beta-3Jisi Liu2016-05-161-2/+8
| |\ \
| | * | Update changes for liteJisi Liu2016-05-161-2/+8
| * | | Merge pull request #1533 from pherl/mapcommentJisi Liu2016-05-161-3/+1
| |\ \ \
| | * | | Remove the comments about iterator validationJisi Liu2016-05-131-3/+1
| |/ / /
| * | | Merge pull request #1532 from pherl/changelogJisi Liu2016-05-131-1/+6
| |\| |
| | * | Update changelogs for C++ mapsJisi Liu2016-05-131-1/+6
| |/ /
| * | Merge pull request #1527 from haberman/changelogJisi Liu2016-05-121-1/+14
| |\ \
| | * | Added release notes for Ruby and JavaScript.Josh Haberman2016-05-121-1/+14
| |/ /
| * | Merge pull request #1520 from pherl/hashmapvs2008Jisi Liu2016-05-121-3/+55
| |\ \