aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
* | Merge pull request #4504 from xfxyjwf/liteFeng Xiao2018-04-188-274/+122
|\ \
| * | Update Makefile.am for Java lite files.Feng Xiao2018-04-181-3/+1
| * | Cleanup + documentation for Java Lite runtime.Feng Xiao2018-04-127-271/+121
* | | Merge pull request #4517 from rcane/feature/vc2017_build_fixAdam Cozzette2018-04-168-20/+13
|\ \ \
| * | | Fixed a Visual Studio 2017 build error. (#4488)Ronny Krüger2018-04-168-20/+13
| |/ /
* | | Merge pull request #4510 from BSBandme/fix_kokoro_benchmark_buildYilun Chong2018-04-163-117/+10
|\ \ \ | |/ / |/| / | |/
| * fix java benchmark, fix dashboard buildYilun Chong2018-04-133-117/+10
|/
* Merge pull request #4478 from BSBandme/proto2_to_proto3_toolsYilun Chong2018-04-106-53/+584
|\
| * fix pythonYilun Chong2018-04-101-2/+4
| * fix conflictsYilun Chong2018-04-1011-132/+638
| |\
| * | Add gogo benchmarkYilun Chong2018-04-109-122/+685
* | | Merge pull request #4415 from BSBandme/experiementYilun Chong2018-04-1014-208/+743
|\ \ \ | | |/ | |/|
| * | Add script for run and upload the benchmark result to bqYilun Chong2018-04-1015-208/+748
| |/
* | fix json_decode call parameters (#4381)urfinjuezz2018-04-091-1/+1
* | includes the expected class in the exception, otherwise the error is harder t...Brent Shaffer2018-04-091-1/+1
* | Add __init__.py files to compiler and util subpackages (#4117)Thomas Hisch2018-04-095-11/+3
* | For windows, all python version should use /MT (#4468)Paul Yang2018-04-061-3/+1
* | Add the files added in #4485.Thomas Van Lenten2018-04-061-0/+2
* | Update Xcode settingsSergio Campama2018-04-068-18/+42
* | Deliberately call simple code to avoid Unity linker pruningJon Skeet2018-04-061-0/+19
* | Merge pull request #4475 from chenchuanyin/patch-1Feng Xiao2018-04-051-0/+3
|\ \
| * | Fix problem: cmake build failed in c++11 by clangSilver Chan2018-04-041-0/+3
* | | Merge pull request #4283 from ObsidianMinor/csharp/better-test-runnersFeng Xiao2018-04-046-60/+9
|\ \ \ | |/ / |/| |
| * | Updated csharp/README.md to reflect testing changesObsidianMinor2018-04-041-4/+2
| * | Remove Google.Protobuf.Test/Program.cs from Makefile.amObsidianMinor2018-02-061-1/+0
| * | Adjusted appveyor batchObsidianMinor2018-02-061-2/+2
| * | Updated NUnit packages, removed NUnitLite added packages for dotnet and Visua...ObsidianMinor2018-02-063-53/+5
* | | Merge branch (#4466)Paul Yang2018-04-0214-19/+53
* | | js message support for jstype string on integers (#4332)Charlie Moad2018-04-021-0/+11
* | | Merge pull request #4467 from xfxyjwf/errorFeng Xiao2018-04-021-1/+6
|\ \ \
| * | | Improve error message when googletest is missing.Feng Xiao2018-04-021-1/+6
* | | | Merge pull request #4411 from pravin-dsilva/protobuf-ppc64leFeng Xiao2018-04-023-2/+10
|\ \ \ \
| * | | | Add support for power ppc64lepravin-dsilva2018-03-223-2/+10
| | |_|/ | |/| |
* | | | Merge pull request #4447 from ejona86/cleaner-protoc-artifactsFeng Xiao2018-04-023-11/+32
|\ \ \ \
| * | | | protoc-artifacts: Use ENTRYPOINT to enable devtoolset-1.1Eric Anderson2018-03-283-2/+17
| * | | | protoc-artifacts: Avoid storing temporary files and use fewer layersEric Anderson2018-03-281-7/+11
| * | | | protoc-artifacts: Avoid checking out protobuf codeEric Anderson2018-03-282-3/+5
| | |/ / | |/| |
* | | | Merge pull request #4452 from xfxyjwf/docFeng Xiao2018-04-022-71/+85
|\ \ \ \
| * | | | Update instructions about getting protobuf source.Feng Xiao2018-03-292-71/+85
| |/ / /
* | | | Merge pull request #4464 from thomasvl/includes3Thomas Van Lenten2018-04-0243-40/+1351
|\ \ \ \ | |/ / / |/| | |
| * | | Don't generate imports for the WKTs unless generating the WKTs.Thomas Van Lenten2018-04-024-8/+21
| * | | Add compile test sources for to test include order.Thomas Van Lenten2018-04-0228-0/+1229
| * | | Trim imports for bundled generated protos.Thomas Van Lenten2018-04-0213-33/+102
|/ / /
* | | Merge pull request #4433 from xfxyjwf/licenseFeng Xiao2018-03-281-11/+1
|\ \ \
| * | | Cleanup LICENSE file.Feng Xiao2018-03-261-11/+1
* | | | Merge pull request #4445 from xfxyjwf/badgeFeng Xiao2018-03-281-14/+12
|\ \ \ \
| * | | | Add kokoro build status badges.Feng Xiao2018-03-271-14/+12
* | | | | Merge pull request #4442 from xfxyjwf/cleanFeng Xiao2018-03-2710-692/+0
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Delete unused directories.Feng Xiao2018-03-2710-692/+0
|/ / / /
* | | | Merge pull request #4439 from acozzette/remove-atomicops-stubAdam Cozzette2018-03-272-238/+1
|\ \ \ \