aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Add more detailed comments for declaration propertiesJon Skeet2018-09-221-5/+11
* Add files to Makefile.am to fix dist targetsJon Skeet2018-09-221-0/+3
* Simplify descriptor testsJon Skeet2018-09-221-13/+13
* Add comment about FileDescriptor not exposing a declarationJon Skeet2018-09-221-0/+3
* Provide simple access to descriptor declarations in C#Jon Skeet2018-09-2212-35/+755
* Merge pull request #5127 from xfxyjwf/mergeFeng Xiao2018-09-171-3/+19
|\
| * Merge remote-tracking branch 'google/3.6.x'Feng Xiao2018-09-071-3/+19
| |\
| | * Merge pull request #5048 from jozefizso/fix/4579_backport_for_3.6.x3.6.xFeng Xiao2018-08-207-4/+80
| | |\
| | | * Backport the PR #4579 to 3.6.x branchJozef Izso2018-08-157-4/+80
| | * | Merge pull request #5049 from nehaljwani/backport-4854Adam Cozzette2018-08-162-4/+4
| | |\ \ | | | |/ | | |/|
| | | * Set LIBPROTOBUF_EXPORT on GenericTypeHandler<class google::protobuf::Message>Nehal J Wani2018-08-151-3/+3
| | | * Set LIBPROTOBUF_EXPORT on GzipOutputStream::OptionsAdam Cozzette2018-08-151-1/+1
| | |/
| | * Python wheel kokoro for windows (#5034)Paul Yang2018-08-133-0/+123
| | * Python wheel kokoro for mac (#5017)Paul Yang2018-08-082-0/+55
| | * Python wheel kokoro dev (#5002)Paul Yang2018-08-063-0/+101
| | * Update php package.xml to 3.6.1 (#5000)Paul Yang2018-08-031-3/+19
| | * Merge pull request #4997 from jtattermusch/backport_nuget_buildingFeng Xiao2018-08-034-2/+18
| | |\
| | | * upgrade dotnet SDK to 2.1.3 on kokoro linuxJan Tattermusch2018-08-031-1/+1
| | | * Revert "overcome the global.json constraint with a hack"Jan Tattermusch2018-08-031-9/+0
| | | * use SDK version available on KokoroJan Tattermusch2018-08-031-1/+1
| | | * overcome the global.json constraint with a hackJan Tattermusch2018-08-031-0/+9
| | | * fix build_nuget.batJan Tattermusch2018-08-031-1/+1
| | | * add scripts for automated building of C# nuget on KokoroJan Tattermusch2018-08-032-0/+16
| | |/
* | | Merge pull request #5085 from scentini/compiler-flagFeng Xiao2018-09-102-4/+24
|\ \ \
| * | | Create compiler_config_setting.bzlscentini2018-08-281-0/+21
| * | | use flag_values = {"@bazel_tools//tools/cpp:compiler": "x"} for compiler conf...scentini2018-08-281-4/+3
* | | | Cross-link descriptor when building from byte stringsJon Skeet2018-09-102-12/+44
* | | | Merge pull request #5105 from sigurdm/invoke_plugin_via_cmdFeng Xiao2018-09-101-4/+5
|\ \ \ \
| * | | | On Windows invoke plugins using cmd.exeSigurd Meldgaard2018-09-031-4/+5
* | | | | Merge pull request #5122 from elharo/guava20Feng Xiao2018-09-101-1/+1
|\ \ \ \ \
| * | | | | update to Guava 20Elliotte Rusty Harold2018-09-071-1/+1
* | | | | | Remove 2to3 code from setup.py. (#5114)Benjamin Peterson2018-09-101-7/+1
| |_|_|/ / |/| | | |
* | | | | Merge pull request #5125 from jtattermusch/upport_kokoro_release_pythonJan Tattermusch2018-09-078-0/+279
|\ \ \ \ \
| * | | | | upport kokoro/release/python from 3.6.x branchJan Tattermusch2018-09-078-0/+279
* | | | | | Merge pull request #5109 from haberman/integrateJoshua Haberman2018-09-07364-15969/+15849
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Fixed Python extension compile.Josh Haberman2018-09-072-7/+7
| * | | | | Regenerated Objective C protos.Josh Haberman2018-09-072-2/+3
| * | | | | Removed obsolete hash_map header that was breaking the compile.Josh Haberman2018-09-071-1/+0
| * | | | | Reverted changes to map_lite_test.proto.Josh Haberman2018-09-071-2/+3
| * | | | | Regenerated C# protos.Josh Haberman2018-09-042-2/+3
| * | | | | Down-integrate from google3.Josh Haberman2018-09-04363-15969/+15847
| | |_|/ / | |/| | |
* | | | | Merge pull request #5123 from jtattermusch/collect_all_artifactsJan Tattermusch2018-09-072-0/+69
|\ \ \ \ \
| * | | | | experimental collect_all_artifacts scriptJan Tattermusch2018-09-072-0/+69
| | |/ / / | |/| | |
* | | | | Merge pull request #5111 from kykrueger/masterFeng Xiao2018-09-071-1/+13
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Update README.md with gradle instructions for javaKyle Krueger2018-09-061-1/+13
| | |/ / | |/| |
* / | | Add source dependency of test suite implementation to main function (#5069)Paul Yang2018-09-064-230/+202
|/ / /
* | | Merge pull request #5103 from haberman/cmakeJoshua Haberman2018-09-021-0/+1
|\ \ \
| * | | Added conformance test impl file to CMake.Joshua Haberman2018-09-021-0/+1
* | | | Merge pull request #5099 from oqton/feature/issue-5806Feng Xiao2018-09-023-1/+41
|\ \ \ \ | |/ / / |/| | |
| * | | Also make sure known fields come across as expectedBrandon Cole2018-08-301-1/+6
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-23 21:52:08 +0000