aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #1893 from google/3.0.0-GAJisi Liu2016-07-2923-53/+158
|\
| * Merge pull request #1892 from xfxyjwf/compatibility_testsJisi Liu2016-07-292-0/+13
| |\
| | * Run Java compatibility tests on Travis.Feng Xiao2016-07-292-0/+13
| * | Merge pull request #1891 from pherl/pythonJisi Liu2016-07-291-0/+2
| |\ \ | | |/ | |/|
| | * add setup.cfg for building wheelsJisi Liu2016-07-291-0/+2
| * | Merge pull request #1888 from pherl/fixbuildzipJisi Liu2016-07-291-2/+8
| |\ \ | | |/ | |/|
| | * Fix the build-zip.sh to add .exe for win packages.Jisi Liu2016-07-291-2/+8
| |/
| * Merge pull request #1874 from pherl/buildzipJisi Liu2016-07-282-19/+31
| |\
| | * Change the build.zip.sh to support liteJisi Liu2016-07-282-19/+31
| * | Merge pull request #1871 from pherl/fixwinJisi Liu2016-07-281-5/+3
| |\ \ | | |/ | |/|
| | * Fix build protoc script for windowsJisi Liu2016-07-281-5/+3
| |/
| * Merge pull request #1864 from pherl/galogsv3.0.0Jisi Liu2016-07-271-0/+51
| |\
| | * Change log for 3.0 GA release.Jisi Liu2016-07-271-0/+51
| |/
| * Merge pull request #1853 from pherl/3.0.0-GAJisi Liu2016-07-262-8/+22
| |\
| | * fix comments.Jisi Liu2016-07-261-1/+1
| | * Merge remote-tracking branch 'origin/3.0.0-GA' into 3.0.0-GAJisi Liu2016-07-264-14/+23
| | |\ | | |/ | |/|
| * | Merge pull request #1851 from xfxyjwf/cintFeng Xiao2016-07-262-5/+5
| |\ \
| | * | Fixes traivs cpp build.Feng Xiao2016-07-262-5/+5
| |/ /
| * | Merge pull request #1847 from haberman/GAfixesJoshua Haberman2016-07-2612-18/+182
| |\ \
| | * | Fixed Makefile.am for Ruby file rename.Josh Haberman2016-07-261-1/+1
| | * | Merge branch 'master' into 3.0.0-GAJosh Haberman2016-07-2511-17/+181
| | |\ \
| * | \ \ Merge pull request #1841 from pherl/3.0.0-GAJisi Liu2016-07-2613-13/+13
| |\ \ \ \ | | |/ / / | |/| | |
| * | | | Define intX as standard exact-width integer types.Feng Xiao2016-07-252-12/+21
| | | | * Fix the script comments.Jisi Liu2016-07-261-2/+2
| | | | * Make protoc-artifacts able to build plugin.Jisi Liu2016-07-262-8/+22
| | | | * Merge branch 'master' of github.com:google/protobuf into 3.0.0-GAJisi Liu2016-07-2611-17/+181
| | | |/| | | |/|/
| | * | remove extra zeros.Jisi Liu2016-07-251-1/+1
| | * | Make jruby still depend on beta-4Jisi Liu2016-07-251-1/+1
| | * | Bump version number for GAJisi Liu2016-07-2513-13/+13
| |/ /
* | | Merge pull request #1882 from legrosbuffle/fix-checkFeng Xiao2016-07-291-3/+4
|\ \ \
| * | | Be consistent with the use of CHECK()/ GOOGLE_CHECK().Clement Courbet2016-07-291-3/+4
|/ / /
* | | Fixed Makefile.am for Ruby file rename.Josh Haberman2016-07-271-1/+1
* | | Merge pull request #1861 from jskeet/fix_to_camel_caseJisi Liu2016-07-272-2/+16
|\ \ \
| * | | Bring C#'s ToPascalCase method in line with C++.Jon Skeet2016-07-272-2/+16
| | |/ | |/|
* | | Merge pull request #1859 from jskeet/remove-flagJisi Liu2016-07-273-14/+2
|\ \ \ | |/ / |/| |
| * | Remove legacy_enum_values flag for GA.Jon Skeet2016-07-273-14/+2
|/ /
* | Merge pull request #1788 from google/rubypackagecapJoshua Haberman2016-07-256-7/+58
|\ \
| * | Added new file to ruby_EXTRA_DIST.Josh Haberman2016-07-251-0/+1
| * | Added unit test for PascalCasing package names in Ruby.Josh Haberman2016-07-254-1/+13
| * | Ruby: translate package names from snake_case -> PascalCase.Josh Haberman2016-07-251-6/+44
* | | Merge pull request #1846 from xfxyjwf/zipFeng Xiao2016-07-252-0/+113
|\ \ \ | |/ / |/| |
| * | Add a script to build protoc zip packages.Feng Xiao2016-07-252-0/+113
| |/
* | Merge pull request #1837 from haberman/rubygencodenameJoshua Haberman2016-07-256-10/+10
|\ \ | |/ |/|
| * Ruby: generated foo.proto -> foo_pb.rb instead of foo.rb.Josh Haberman2016-07-256-10/+10
* | Merge pull request #1831 from xfxyjwf/protocFeng Xiao2016-07-251-2/+2
|\ \
| * | Fix maven path.Feng Xiao2016-07-231-1/+1
| * | Fix maven links.Feng Xiao2016-07-221-1/+1
* | | Merge pull request #1834 from sergiocampama/frameworkFeng Xiao2016-07-251-8/+17
|\ \ \
| * | | Correctly sets the generate_for_named_framework option after parsing.Sergio Campama2016-07-231-8/+17
| | |/ | |/|
* | | Merge pull request #1821 from haberman/rubyfreezestrJoshua Haberman2016-07-2511-83/+132
|\ \ \ | |/ / |/| |