aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| * Cleanup reflection objects for map entry.Feng Xiao2017-04-062-0/+10
* | Merge pull request #2942 from xfxyjwf/3.3.xFeng Xiao2017-04-0624-42/+150
|\|
| * Update generated code.Feng Xiao2017-04-0513-26/+26
| * Update version number and changelog for 3.3.0Feng Xiao2017-04-0511-16/+124
|/
* Update Java conformance failure list.Feng Xiao2017-03-311-1/+0
* Use "git reset --hard" to actually reset the code.Feng Xiao2017-03-312-3/+3
* Update jenkins Java dependencies.Feng Xiao2017-03-311-1/+1
* Update Java version number and dependency.Feng Xiao2017-03-303-4/+10
* Update objective-c conformance failure list.Feng Xiao2017-03-301-2/+4
* Fix C++ distcheck.Feng Xiao2017-03-301-0/+2
* Fix MSVC DLL build.Feng Xiao2017-03-306-8/+10
* Update python conformance failure list.Feng Xiao2017-03-301-3/+0
* Update jenkins Java maven dependencies.Feng Xiao2017-03-301-1/+1
* Update C# conformance failure list.Feng Xiao2017-03-291-0/+4
* Update python conformance failure list.Feng Xiao2017-03-292-1181/+0
* Fix Java build.Feng Xiao2017-03-294-4/+11
* Update BUILD file for C# tests.Feng Xiao2017-03-291-0/+4
* Fix C++ build for down-integration.Feng Xiao2017-03-298-49/+134
* Down-integrate from google3.Feng Xiao2017-03-29251-5181/+13289
* Removes ignored const from return type (#2915)Juan David Dominguez2017-03-291-1/+1
* Merge pull request #2919 from thomasvl/drop_dispatchThomas Van Lenten2017-03-292-17/+20
|\
| * Remove the use of dispatch_once that is heap backed.Thomas Van Lenten2017-03-292-17/+20
|/
* Merge pull request #2918 from thomasvl/xcode_8_3Thomas Van Lenten2017-03-291-0/+8
|\
| * Add support for Xcode 8.3 to the build helper.Thomas Van Lenten2017-03-291-0/+8
|/
* Merge pull request #2913 from thomasvl/conformance_ignoresThomas Van Lenten2017-03-291-0/+2
|\
| * Add some new ignores for things generated in conformance.Thomas Van Lenten2017-03-281-0/+2
* | Fix gcc warning when using map (#2213)drivehappy2017-03-281-1/+3
* | Merge pull request #2914 from acozzette/naclAdam Cozzette2017-03-281-1/+8
|\ \ | |/ |/|
| * Added a workaround to allow building for NaClAdam Cozzette2017-03-281-1/+8
|/
* Merge pull request #2912 from thomasvl/objc_recursion_limitThomas Van Lenten2017-03-282-10/+23
|\
| * Raise the recursion limit to 100 to match other languages.Thomas Van Lenten2017-03-282-10/+23
|/
* Merge pull request #2858 from haberman/gopackageJoshua Haberman2017-03-272-4/+5
|\
| * Properly regenerated descriptor.proto.Josh Haberman2017-03-161-3/+4
| * Changed go_package for plugin.proto.Josh Haberman2017-03-151-1/+1
* | Merge pull request #1662 from haberman/jsconformanceJoshua Haberman2017-03-277-9/+237
|\ \
| * | Removed obsolete comments and added docs.Josh Haberman2017-03-162-5/+30
| * | Build system fixes for JS conformance tests.Josh Haberman2017-03-141-3/+5
| * | Conformance test for JS now work, though 15 tests fail.Josh Haberman2017-03-133-27/+49
| * | Added JavaScript conformance tests. All tests pass!Josh Haberman2017-03-065-1/+180
| * | WIP.Josh Haberman2017-03-061-4/+4
* | | Merge pull request #2884 from anandolee/masterJie Luo2017-03-273-19/+78
|\ \ \
| * | | Add FormatEnumAsInt support for Json Format. And scale JsonFormatter.Settings...Jie Luo2017-03-243-19/+78
* | | | Merge pull request #2897 from cgrushko/patch-5Feng Xiao2017-03-221-0/+1
|\ \ \ \
| * | | | Compile the Java proto runtime with Java 6cgrushko2017-03-221-0/+1
|/ / / /
* | | | Update commit number in Docker to update composer dependency (#2869)Paul Yang2017-03-215-6/+8
* | | | Merge pull request #2861 from byronyi/#710Adam Cozzette2017-03-207-0/+209
|\ \ \ \
| * | | | Update BUILDBairen Yi2017-03-211-0/+1
| * | | | Update delimited_message_util_test.ccBairen Yi2017-03-181-1/+1
| * | | | fix several issuesByron Yi2017-03-173-15/+15
| * | | | add delimited_message_util.cc to libprotobuf.cmakeByron Yi2017-03-161-0/+1