aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Add missing golden test file.Feng Xiao2016-07-141-0/+1
* Merge pull request #1785 from jskeet/merge-csharpJon Skeet2016-07-1446-881/+538
|\
| * Move to dotnet cli for building, and .NET Core (netstandard1.0) as target pla...Jon Skeet2016-07-1443-818/+367
| * Remove the overload for Add(RepeatedField<T>)Jon Skeet2016-07-142-19/+23
| * Optimize AddRange for sequences implementing ICollectionJon Skeet2016-07-142-8/+110
| * Implement RepeatedField.AddRange.Jon Skeet2016-07-142-1/+23
| * Improve exception throwing implementation in collectionsJon Skeet2016-07-142-45/+25
|/
* Merge pull request #1781 from xfxyjwf/update_versionFeng Xiao2016-07-1415-17/+17
|\
| * Update version number in AssemblyInfo.cs.Feng Xiao2016-07-141-1/+1
| * Update version number to 3.0.0-beta-4Feng Xiao2016-07-1314-16/+16
* | Merge pull request #1783 from xfxyjwf/fixliteJisi Liu2016-07-142-45/+45
|\ \ | |/ |/|
| * Exclude Java lite module from parent pom.xmlFeng Xiao2016-07-131-1/+1
| * Comment out lite conformance test.Feng Xiao2016-07-131-44/+44
|/
* Add missing LIBPROTOBUF_EXPORTFeng Xiao2016-07-131-4/+4
* Add missing LIBPROTOBUF_EXPORT.Feng Xiao2016-07-131-3/+4
* Update generated files.Feng Xiao2016-07-1313-259/+460
* Integrate from internal code base.Feng Xiao2016-07-1359-458/+1133
* Merge pull request #1776 from thomasvl/fix_distThomas Van Lenten2016-07-121-2/+0
|\
| * Remove the baseline files from the make dist file list.Thomas Van Lenten2016-07-121-2/+0
|/
* Fixed out-of-date documentation for CodedInputStream.ReadEnum. (#1581)Jos Hickson2016-07-101-3/+1
* Merge pull request #1702 from lukebakken/csharp-nuget-doc-updateJon Skeet2016-07-101-2/+2
|\
| * Modify csharp README since there are now two NuGet packagesLuke Bakken2016-06-221-2/+2
* | Merge pull request #1764 from jskeet/remove-is-value-typeJon Skeet2016-07-093-35/+6
|\ \
| * | Remove unnecessary reflection callJon Skeet2016-07-083-35/+6
* | | Merge pull request #1762 from thomasvl/drop_perf_profilesThomas Van Lenten2016-07-082-83/+0
|\ \ \ | |/ / |/| |
| * | Drop the performace baselines.Thomas Van Lenten2016-07-082-83/+0
|/ /
* | Merge pull request #1757 from thomasvl/avoid_importing_srcThomas Van Lenten2016-07-076-14/+17
|\ \
| * | Don't #import the .m files.Thomas Van Lenten2016-07-076-14/+17
* | | Merge pull request #1735 from jskeet/attribute-placementJon Skeet2016-07-0733-285/+2601
|\ \ \
| * | | Remove WriteGeneratedTypeAttributes which is a no-opJon Skeet2016-07-075-13/+2
| * | | Changes to generated code from previous commitJon Skeet2016-07-0420-244/+2537
| * | | Move DebuggerNonUserCodeAttribute to function membersJon Skeet2016-07-0413-39/+73
* | | | Merge pull request #1758 from dago/pathmax2Feng Xiao2016-07-071-2/+0
|\ \ \ \
| * | | | Make sure also Solaris x86 gets PATH_MAXDagobert Michelsen2016-07-071-2/+0
|/ / / /
* | | | Merge pull request #1753 from xfxyjwf/fixupJisi Liu2016-07-072-10/+2
|\ \ \ \
| * | | | Fix data member declaration order.Feng Xiao2016-07-061-2/+2
| * | | | Don't support global ::string in stringpiece.hFeng Xiao2016-07-061-8/+0
| | |/ / | |/| |
* | | | Merge pull request #1742 from ottok/fix-spellingFeng Xiao2016-07-0640-68/+68
|\ \ \ \
| * | | | Fix spelling error in function ParseTime parameterOtto Kekäläinen2016-07-031-1/+1
| * | | | Fix spelling in strings and commentsOtto Kekäläinen2016-07-0339-67/+67
| | |/ / | |/| |
* | | | Merge pull request #1752 from acozzette/fix-js-testsAdam Cozzette2016-07-063-2/+486
|\ \ \ \ | |_|/ / |/| | |
| * | | Fixed failing JS testsAdam Cozzette2016-07-063-2/+486
* | | | Merge pull request #1712 from dkharrat/swift-error-handlingThomas Van Lenten2016-07-062-21/+21
|\ \ \ \ | |_|/ / |/| | |
| * | | add nullable qualifier to nil return typesDia Kharrat2016-07-052-21/+21
|/ / /
* | | Merge pull request #1704 from lizan/json_parse_optionsFeng Xiao2016-07-018-32/+214
|\ \ \ | |/ / |/| |
| * | Add JsonParseOptions to ignore unknown fieldsLizan Zhou2016-06-288-32/+214
* | | Merge pull request #1738 from xfxyjwf/fixbuildFeng Xiao2016-07-014-4/+67
|\ \ \
| * | | Fix some failing travis tests.Feng Xiao2016-07-014-4/+67
|/ / /
* | | Merge pull request #1710 from chezRong/masterFeng Xiao2016-07-012-26/+159
|\ \ \
| * | | added minified JSON formatting functionality with testchezRong2016-07-012-26/+159