aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #1873 from pherl/javalitev3.0.0-javaliteJisi Liu2016-07-283-3/+5
|\
| * Update maven to call the plugin to generate javalite code.Jisi Liu2016-07-282-1/+3
| * update javalite versions.Jisi Liu2016-07-282-2/+2
|/
* Merge pull request #1872 from pherl/fixwin-javaliteJisi Liu2016-07-281-5/+3
|\
| * Fix build protoc script for windowsJisi Liu2016-07-281-5/+3
|/
* Merge pull request #1856 from pherl/javaliteJisi Liu2016-07-263-4/+149
|\
| * Change documentation for javalite releaseJisi Liu2016-07-261-4/+13
| * Move the protoc pom to protoc-pom.xml in the lite.Jisi Liu2016-07-261-0/+0
| * Add a pom for javalite pluginJisi Liu2016-07-262-0/+136
* | Merge pull request #1854 from pherl/javaliteJisi Liu2016-07-262-8/+22
|\|
| * fix comments.Jisi Liu2016-07-261-1/+1
| * Fix the script comments.Jisi Liu2016-07-261-2/+2
| * Make protoc-artifacts able to build plugin.Jisi Liu2016-07-262-8/+22
|/
* Merge pull request #1840 from pherl/javaliteJisi Liu2016-07-251-0/+1
|\
| * Add lite plugin output to gitignoreJisi Liu2016-07-251-0/+1
* | Merge pull request #1793 from pherl/javaliteJisi Liu2016-07-152-1/+38
|\|
| * Add a javalite plugin.Jisi Liu2016-07-152-1/+38
|/
* Move to dotnet cli for building, and .NET Core (netstandard1.0) as target pla...Jon Skeet2016-07-1443-818/+367
* Implement RepeatedField.AddRange (#1733)Jon Skeet2016-07-133-63/+171
* Merge pull request #1778 from yeswalrus/fix-prerelease-versionFeng Xiao2016-07-121-1/+1
|\
| * Fix a bad variable dereference causing <package>_FIND_VERSION_PRERELEASE to b...Walter Gray2016-07-121-1/+1
|/
* 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