aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* WIP.jsbinsplitJosh Haberman2016-07-206-192/+201
* Merge pull request #1812 from jskeet/fix-travisJon Skeet2016-07-201-1/+1
|\
| * Use the dotnet-release package feed for Travis.Jon Skeet2016-07-191-1/+1
* | Merge pull request #1447 from seishun/defaultsJoshua Haberman2016-07-204-73/+80
|\ \ | |/ |/|
| * fix debug.dumpNikolai Vavilov2016-07-201-2/+4
| * restore old behavior for toObjectNikolai Vavilov2016-07-192-13/+37
| * nitsNikolai Vavilov2016-07-191-32/+21
| * Make implicit defaults consistent with explicit defaultsNikolai Vavilov2016-07-193-96/+88
|/
* Merge pull request #1802 from haberman/jsmapbinJoshua Haberman2016-07-184-131/+151
|\
| * Fix goog.require()/goog.provide() ordering.Josh Haberman2016-07-182-2/+2
| * JavaScript: move extension binary info to separate struct.Josh Haberman2016-07-183-38/+85
| * JavaScript maps: move binary callbacks out of constructor.Josh Haberman2016-07-183-93/+66
* | Merge pull request #1803 from xfxyjwf/javadocFeng Xiao2016-07-196-16/+42
|\ \
| * | Include javadoc/source in Java release packages.Feng Xiao2016-07-186-16/+42
|/ /
* | Merge remote-tracking branch 'origin/3.0.0-beta-4'Feng Xiao2016-07-1890-784/+1811
|\ \ | |/ |/|
| * Merge pull request #1792 from xfxyjwf/changelogv3.0.0-beta-4Feng Xiao2016-07-182-1/+82
| |\
| | * Remove Java deterministic API.Feng Xiao2016-07-182-5/+2
| | * Mention Java lite in the changelog.Feng Xiao2016-07-151-0/+4
| | * Added 3.0.0-beta-4 changelog.Feng Xiao2016-07-151-0/+80
| |/
| * Merge pull request #1787 from xfxyjwf/steppingstoneFeng Xiao2016-07-152-4/+72
| |\
| | * Fix compatiblity issues.Feng Xiao2016-07-142-4/+72
| |/
| * 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 #1801 from thomasvl/oneof_framework_build_issuesThomas Van Lenten2016-07-182-2/+2
|\ \
| * | Use public methods to fetch oneofs in generated code.Thomas Van Lenten2016-07-182-2/+2
|/ /
* | Exposes the currently registered extensions for a message and removes the int...Sergio Campamá2016-07-154-10/+5
* | Uses head version of rvm to avoid shell_update_session not found error (#1791)Sergio Campamá2016-07-151-0/+4
* | 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
|\