aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
...
* | | | Merge pull request #1830 from xfxyjwf/travisFeng Xiao2016-07-231-14/+7
|\ \ \ \
| * | | | Keep cpp_distcheck on travis for now.Feng Xiao2016-07-222-4/+7
| * | | | Remove linux tests from travis.Feng Xiao2016-07-222-11/+1
| | |/ / | |/| |
* | | | Merge pull request #1829 from xfxyjwf/fixcppFeng Xiao2016-07-234-349/+34
|\ \ \ \ | |/ / / |/| | |
| * | | Fix sign-comparison warnings in public header files.Feng Xiao2016-07-222-6/+6
| * | | Add a test to catch sign-comparison warnings.Feng Xiao2016-07-222-343/+28
* | | | Merge pull request #1825 from xfxyjwf/jenkins2Feng Xiao2016-07-225-23/+39
|\ \ \ \
| * | | | Add more tests to jenkins.Feng Xiao2016-07-215-23/+39
| |/ / /
* | | | Merge pull request #1828 from sergiocampama/frameworkFeng Xiao2016-07-222-2/+3
|\ \ \ \ | |/ / / |/| | |
| * | | Fixes the parsing of the proto-framework map file.Sergio Campama2016-07-222-2/+3
|/ / /
* | | Merge pull request #1822 from xfxyjwf/java6Feng Xiao2016-07-212-20/+3
|\ \ \ | |/ / |/| |
| * | Update travis tests for Java.Feng Xiao2016-07-212-20/+3
|/ /
* | Merge pull request #1811 from xfxyjwf/fixdistFeng Xiao2016-07-202-0/+26
|\ \
| * | Add missing files in EXTRA_DIST and add a test.Feng Xiao2016-07-202-0/+26
|/ /
* | Merge pull request #1810 from xfxyjwf/versioningFeng Xiao2016-07-2013-768/+2879
|\ \
| * | Add files missing from "make dist".Feng Xiao2016-07-192-36/+96
| * | Update compatibility tests as well.Feng Xiao2016-07-193-347/+8
| * | Versioning Java GeneratedMessage.Feng Xiao2016-07-198-385/+2775
* | | 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