aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | Integrated internal changes from GoogleAdam Cozzette2018-03-13282-14041/+15223
|/ / / / / / /
* | | | | | | Merge pull request #4302 from BSBandme/down_integ_benchmarkYilun Chong2018-02-0917-30/+89
|\ \ \ \ \ \ \
| * | | | | | | Sync internal benchmark changesYilun Chong2018-02-0917-30/+89
* | | | | | | | Remove stray indent on normal imports.Thomas Van Lenten2018-02-081-2/+2
* | | | | | | | Merge pull request #4288 from nico/nofallFeng Xiao2018-02-082-16/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Remove use of GOOGLE_FALLTHROUGH_INTENDED from protobuf.Nico Weber2018-02-072-16/+1
* | | | | | | | Fix up the docs to mention the WKTs generated files also.Thomas Van Lenten2018-02-071-4/+6
|/ / / / / / /
* | | | | | | Merge pull request #4259 from Mizux/masterFeng Xiao2018-02-025-5/+12
|\ \ \ \ \ \ \
| * | | | | | | Use NEW behaviour for project VERSION variables.Corentin Le Molgat2018-02-011-0/+4
| * | | | | | | Even with MSVC enable zlib support as default behaviour.Corentin Le Molgat2018-02-011-5/+1
| * | | | | | | Add CMake ALIAS targetsCorentin Le Molgat2018-02-014-0/+4
| * | | | | | | Add VERSION property to CMake library targetsCorentin Le Molgat2018-02-013-0/+3
* | | | | | | | Merge pull request #4257 from davido/support_java9Feng Xiao2018-02-011-1/+15
|\ \ \ \ \ \ \ \
| * | | | | | | | Bazel: Support building with Java 9David Ostrovsky2018-01-311-1/+15
* | | | | | | | | Merge pull request #4265 from BSBandme/upgrade_benchmark_submoduleYilun Chong2018-02-012-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | upgrade submoduleYilun Chong2018-02-012-1/+1
* | | | | | | | | | Merge pull request #4266 from brunokim/patch-1Jisi Liu2018-02-011-1/+1
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Fix link markup in third party list.Bruno Kim Medeiros Cesar2018-02-011-1/+1
|/ / / / / / / / /
* | | | | | | | | Merge pull request #4239 from mrpi/masterAdam Cozzette2018-01-311-4/+2
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Fix -fpermissive: '<::' cannot begin a template-argument listLudger Sprenker2018-01-301-1/+1
| * | | | | | | | | Create std::string in Arena memoryLudger Sprenker2018-01-241-4/+2
* | | | | | | | | | Work around strange error with atomic and swift under Xcode 8.3.3.Thomas Van Lenten2018-01-313-42/+42
* | | | | | | | | | Don't assume c-strings are 4 byte aligned.Thomas Van Lenten2018-01-311-2/+4
* | | | | | | | | | Fix to use "nil" instead of "NULL" for objc objects.Thomas Van Lenten2018-01-313-5/+5
* | | | | | | | | | Work around the static analyzer false report.Thomas Van Lenten2018-01-311-0/+6
* | | | | | | | | | Add casts to removed undefined behaviors around shifts.Thomas Van Lenten2018-01-316-11/+11
| |/ / / / / / / / |/| | | | | | | |
* | | | | | | | | Merge pull request #4249 from nlochschmidt/patch-1Feng Xiao2018-01-301-0/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Propose kotlinx.serialization as 3rd party lib Niklas Lochschmidt2018-01-301-0/+1
* | | | | | | | | | Move kokoro macOS builds to to Xcode 9.1.Thomas Van Lenten2018-01-301-1/+1
|/ / / / / / / / /
* | | | | | | | | Merge pull request #3825 from ras0219-msft/patch-1Jisi Liu2018-01-291-0/+10
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Add Vcpkg to C++ installation instructions for WindowsRobert Schumacher2018-01-291-0/+10
|/ / / / / / / / /
* | | | | | | | | Merge pull request #4196 from mathstuf/cmake-private-target-sourcesAdam Cozzette2018-01-291-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | cmake: privately add sources to targetsBen Boeckel2018-01-191-1/+1
| | |_|_|_|_|/ / / | |/| | | | | | |
* | | | | | | | | Merge pull request #4240 from davido/generate_warning_free_java_codeFeng Xiao2018-01-292-0/+30
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Java: Generate warning free codeDavid Ostrovsky2018-01-272-0/+30
* | | | | | | | | | Merge pull request #4209 from acozzette/using-statementsAdam Cozzette2018-01-2938-151/+146
|\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Removed using statements from common.hAdam Cozzette2018-01-2638-151/+146
|/ / / / / / / / /
* | | | | | | | | Merge pull request #4229 from leighmcculloch/patch-1Feng Xiao2018-01-261-1/+0
|\ \ \ \ \ \ \ \ \ | | |_|/ / / / / / | |/| | | | | | |
| * | | | | | | | Remove broken link to code.google.com/p/protorpcLeigh McCulloch2018-01-251-1/+0
|/ / / / / / / /
* | | | | | | | Merge pull request #3934 from xfxyjwf/builtsourcesFeng Xiao2018-01-251-4/+4
|\ \ \ \ \ \ \ \
| * | | | | | | | Remove the use of BUILT_SOURCESFeng Xiao2018-01-241-4/+4
| | |/ / / / / / | |/| | | | | |
* | | | | | | | Update .NET SDK to 2.0.3Jon Skeet2018-01-253-6/+17
* | | | | | | | Merge pull request #4226 from themattchan/patch-1Feng Xiao2018-01-251-0/+2
|\ \ \ \ \ \ \ \
| * | | | | | | | Add Haskell implementationsMatt Chan2018-01-241-0/+2
* | | | | | | | | Add an explicit import of stdatomic.h.Thomas Van Lenten2018-01-254-2/+39
* | | | | | | | | Bring back import of OSAtomic.Thomas Van Lenten2018-01-251-0/+6
|/ / / / / / / /
* | | | | | | | Merge pull request #4224 from davido/drop_java_6_supportFeng Xiao2018-01-242-4/+4
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | |
| * | | | | | | Drop java 6 supportDavid Ostrovsky2018-01-252-4/+4
|/ / / / / / /
* | | | | | | Merge pull request #4205 from xuwei-k/patch-2Feng Xiao2018-01-231-1/+1
|\ \ \ \ \ \ \
| * | | | | | | fix typo in FieldMaskTree.java commentkenji yoshida2018-01-221-1/+1
| |/ / / / / /