aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* 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
| |/
* / Migrate away from deprecated OSAtomic APIs. (#4184)Jonathan Dierksen2018-01-226-16/+20
|/
* Add DiscardUnknownFields support for C#Jon Skeet2018-01-155-56/+173
* Merge pull request #4158 from BSBandme/FixBenchmarksYilun Chong2018-01-106-62/+60
|\
| * Update py_benchmark.pyYilun Chong2018-01-101-1/+1
| * Fix java benchmark to use parser, fix cpp benchmark new arena to use Reset, f...Yilun Chong2018-01-096-61/+59
|/
* Merge pull request #4148 from datacompboy/patch-2Adam Cozzette2018-01-081-0/+53
|\
| * Update time_test.ccAnton Fedorov2018-01-051-0/+53
* | Merge pull request #4147 from datacompboy/patch-1Adam Cozzette2018-01-081-2/+2
|\ \
| * | Fix ValidateDateTime: check day instead monthAnton Fedorov2018-01-051-2/+2
| |/
* | Merge pull request #4132 from BSBandme/JavaCaliperCounterYilun Chong2018-01-052-12/+64
|\ \
| * | Add counter to Java benchmarkYilun Chong2018-01-052-12/+64
* | | Merge pull request #4065 from BSBandme/python_benchmark_realYilun Chong2018-01-055-8/+284
|\ \ \ | |_|/ |/| |
| * | Add python benchmarkYilun Chong2018-01-055-8/+284
| |/
* | Merge pull request #4131 from pherl/mergeJisi Liu2018-01-0455-218/+853
|\ \
| * \ Merge remote-tracking branch 'origin/3.5.x' into masterJisi Liu2018-01-032-7/+4
| |\ \
| | * \ Merge pull request #4124 from pherl/nullptrJisi Liu2018-01-031-1/+1
| | |\ \
| | | * | remove nullptrJisi Liu2018-01-021-1/+1
| | * | | Merge pull request #4090 from pherl/nopasswordJisi Liu2018-01-031-6/+3
| | |\ \ \ | | | |/ / | | |/| |