aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
| | * | Merge pull request #2996 from xfxyjwf/3.3.xFeng Xiao2017-04-201-1/+1
| | |\ \
| | | * | Fix python3 issue.Feng Xiao2017-04-201-1/+1
| | * | | Allow proto files to import descriptor.proto (#2995)Paul Yang2017-04-208-5/+51
| | |/ /
| | * | Prepend "PB" to generated classes whose name are reserved words. (#2990)Paul Yang2017-04-208-61/+163
| | * | Add test for nested enum for php (#2989)Paul Yang2017-04-194-0/+22
| | * | Enum defined without package have incorrect class name. (#2988)Paul Yang2017-04-195-53/+54
| | * | Make PHP c extension work with PHP7 (#2951)Paul Yang2017-04-1923-1187/+1891
| | * | Merge pull request #2967 from xfxyjwf/3.3.xFeng Xiao2017-04-118-4/+528
| | |\ \
| | | * | Cherry-pick cl/152450543Feng Xiao2017-04-118-2/+472
| | | * | Cherry-pick cl/151775298Feng Xiao2017-04-112-2/+56
| | |/ /
| | * | Merge pull request #2955 from xfxyjwf/3.3.xFeng Xiao2017-04-111-0/+1
| | |\ \
| | | * | Add include for INT_MAXFeng Xiao2017-04-081-0/+1
| | * | | cherrypick descriptor_pool.FindFileContainingSymbol by extensions (#2962)Jie Luo2017-04-104-8/+45
| | |/ /
| | * | Merge pull request #2949 from xfxyjwf/3.3.xFeng Xiao2017-04-072-0/+10
| | |\ \
| | | * | 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
* | | | added "objectivec" build target (#3033)makdharma2017-05-011-0/+81
|/ / /
* | | Merge pull request #3023 from acozzette/minAdam Cozzette2017-04-271-1/+1
|\ \ \
| * | | Fully qualify min as std::min in wire_format_lite.ccAdam Cozzette2017-04-271-1/+1
|/ / /
* | | Merge pull request #3018 from acozzette/using-namespace-stdAdam Cozzette2017-04-2615-98/+108
|\ \ \
| * | | Remove "using namespace std" from stubs/common.hAdam Cozzette2017-04-2615-98/+108
* | | | Merge pull request #3015 from buchgr/unused-constsFeng Xiao2017-04-261-2/+0
|\ \ \ \ | |/ / / |/| | |
| * | | Remove unused constants.Jakob Buchgraber2017-04-251-2/+0
|/ / /
* | | Merge pull request #3008 from postmasters/patch-1Feng Xiao2017-04-241-12/+13
|\ \ \
| * | | Add a link to dart-lang/protobufpostmasters2017-04-241-12/+13
|/ / /
* | | Merge pull request #2992 from xiaogaozi/patch-1Feng Xiao2017-04-201-1/+1
|\ \ \
| * | | Add gogoprotobuf to third-party add-ons listChangjian Gao2017-04-201-1/+1
|/ / /
* | | Merge pull request #2508 from yliu120/pass_default_env_to_protocFeng Xiao2017-04-190-0/+0
|\ \ \
| * | | add a key to ctx.action dict to prevent protoc losing the default envYunlong Liu2016-12-161-1/+2
* | | | Merge pull request #2987 from konsumer/patch-1Feng Xiao2017-04-191-0/+1
|\ \ \ \
| * | | | Add node-protoc-plugin to "Other Utilities"David Konsumer2017-04-181-0/+1
* | | | | Merge pull request #2982 from mda000/issue2972Adam Cozzette2017-04-191-1/+1
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Simplify the Element dtor invocation when freeing elements inMichael Allen2017-04-171-1/+1