aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Expand)AuthorAge
* Cherry-pick cl/152450543Gravatar Feng Xiao2017-04-11
* Cherry-pick cl/151775298Gravatar Feng Xiao2017-04-11
* Merge pull request #2955 from xfxyjwf/3.3.xGravatar Feng Xiao2017-04-11
|\
* | cherrypick descriptor_pool.FindFileContainingSymbol by extensions (#2962)Gravatar Jie Luo2017-04-10
| * Add include for INT_MAXGravatar Feng Xiao2017-04-08
|/
* Merge pull request #2949 from xfxyjwf/3.3.xGravatar Feng Xiao2017-04-07
|\
| * Cleanup reflection objects for map entry.Gravatar Feng Xiao2017-04-06
* | Merge pull request #2942 from xfxyjwf/3.3.xGravatar Feng Xiao2017-04-06
|\|
| * Update generated code.Gravatar Feng Xiao2017-04-05
| * Update version number and changelog for 3.3.0Gravatar Feng Xiao2017-04-05
|/
* Update Java conformance failure list.Gravatar Feng Xiao2017-03-31
* Use "git reset --hard" to actually reset the code.Gravatar Feng Xiao2017-03-31
* Update jenkins Java dependencies.Gravatar Feng Xiao2017-03-31
* Update Java version number and dependency.Gravatar Feng Xiao2017-03-30
* Update objective-c conformance failure list.Gravatar Feng Xiao2017-03-30
* Fix C++ distcheck.Gravatar Feng Xiao2017-03-30
* Fix MSVC DLL build.Gravatar Feng Xiao2017-03-30
* Update python conformance failure list.Gravatar Feng Xiao2017-03-30
* Update jenkins Java maven dependencies.Gravatar Feng Xiao2017-03-30
* Update C# conformance failure list.Gravatar Feng Xiao2017-03-29
* Update python conformance failure list.Gravatar Feng Xiao2017-03-29
* Fix Java build.Gravatar Feng Xiao2017-03-29
* Update BUILD file for C# tests.Gravatar Feng Xiao2017-03-29
* Fix C++ build for down-integration.Gravatar Feng Xiao2017-03-29
* Down-integrate from google3.Gravatar Feng Xiao2017-03-29
* Removes ignored const from return type (#2915)Gravatar Juan David Dominguez2017-03-29
* Merge pull request #2919 from thomasvl/drop_dispatchGravatar Thomas Van Lenten2017-03-29
|\
| * Remove the use of dispatch_once that is heap backed.Gravatar Thomas Van Lenten2017-03-29
|/
* Merge pull request #2918 from thomasvl/xcode_8_3Gravatar Thomas Van Lenten2017-03-29
|\
| * Add support for Xcode 8.3 to the build helper.Gravatar Thomas Van Lenten2017-03-29
|/
* Merge pull request #2913 from thomasvl/conformance_ignoresGravatar Thomas Van Lenten2017-03-29
|\
* | Fix gcc warning when using map (#2213)Gravatar drivehappy2017-03-28
* | Merge pull request #2914 from acozzette/naclGravatar Adam Cozzette2017-03-28
|\ \
| * | Added a workaround to allow building for NaClGravatar Adam Cozzette2017-03-28
|/ /
| * Add some new ignores for things generated in conformance.Gravatar Thomas Van Lenten2017-03-28
|/
* Merge pull request #2912 from thomasvl/objc_recursion_limitGravatar Thomas Van Lenten2017-03-28
|\
| * Raise the recursion limit to 100 to match other languages.Gravatar Thomas Van Lenten2017-03-28
|/
* Merge pull request #2858 from haberman/gopackageGravatar Joshua Haberman2017-03-27
|\
* \ Merge pull request #1662 from haberman/jsconformanceGravatar Joshua Haberman2017-03-27
|\ \
* \ \ Merge pull request #2884 from anandolee/masterGravatar Jie Luo2017-03-27
|\ \ \
| * | | Add FormatEnumAsInt support for Json Format. And scale JsonFormatter.Settings...Gravatar Jie Luo2017-03-24
* | | | Merge pull request #2897 from cgrushko/patch-5Gravatar Feng Xiao2017-03-22
|\ \ \ \
| * | | | Compile the Java proto runtime with Java 6Gravatar cgrushko2017-03-22
|/ / / /
* | | | Update commit number in Docker to update composer dependency (#2869)Gravatar Paul Yang2017-03-21
* | | | Merge pull request #2861 from byronyi/#710Gravatar Adam Cozzette2017-03-20
|\ \ \ \
| * | | | Update BUILDGravatar Bairen Yi2017-03-21
* | | | | Merge pull request #2860 from prehistoric-penguin/masterGravatar Feng Xiao2017-03-20
|\ \ \ \ \
* \ \ \ \ \ Merge pull request #2854 from hesmar/attributesFixGravatar Adam Cozzette2017-03-20
|\ \ \ \ \ \
* \ \ \ \ \ \ Merge pull request #2870 from acozzette/memcpy-memmoveGravatar Adam Cozzette2017-03-20
|\ \ \ \ \ \ \
* \ \ \ \ \ \ \ Merge pull request #2867 from mojoBrendan/masterGravatar Feng Xiao2017-03-17
|\ \ \ \ \ \ \ \