aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #759 from TeBoring/beta-1-2v3.0.0-beta-1v3.0.0-alpha-4Feng Xiao2015-08-271-5/+19
|\
| * Fix Protobuf.podspecTeBoring2015-08-261-5/+19
* | Merge pull request #757 from xfxyjwf/python_failureJisi Liu2015-08-261-0/+7
|\ \
| * | Excludes a failing python cpp test case.Feng Xiao2015-08-261-0/+7
|/ /
* | Make jruby use Java 3.0.0-alpha-3.Feng Xiao2015-08-261-1/+1
* | Update generated file.Feng Xiao2015-08-261-1/+0
* | Fix merge conflict.Feng Xiao2015-08-261-1/+0
* | Merge pull request #756 from TeBoring/beta-1Feng Xiao2015-08-261-0/+1
|\ \
| * | Add distribution for objcBo Yang2015-08-261-0/+2
* | | Update Makefile.am to include missing files.Feng Xiao2015-08-261-11/+45
|\ \ \ | |_|/ |/| |
| * | Add missing files in dist.Feng Xiao2015-08-261-1/+21
* | | Merge pull request #755 from pherl/beta-1Jisi Liu2015-08-261-0/+3
|\ \ \
| * | | Add bazel build/workspace into distribution.Jisi Liu2015-08-261-0/+3
|/ / /
* | | Merge pull request #754 from xfxyjwf/changelogFeng Xiao2015-08-261-0/+106
|\ \ \ | |_|/ |/| |
| * | Update change log for beta-1.Feng Xiao2015-08-261-0/+106
* | | Merge pull request #750 from TeBoring/beta-1Paul Yang2015-08-2616-29/+457
|\ \ \ | |/ / |/| |
| * | Fix bugs for objectivecTeBoring2015-08-2616-29/+457
* | | Merge branch 'master' of github.com:google/protobuf into beta-1Feng Xiao2015-08-263-11/+27
|\ \ \ | | |/ | |/|
| * | Merge pull request #728 from dano/py3_str_compatJoshua Haberman2015-08-263-11/+27
| |\ \
| | * | Fix metaclass issue on Python 3. Get text handling tests passing on Python 3.Dan O'Reilly2015-08-223-13/+9
| | * | Start work on getting text handled properly on PY3Dan O'Reilly2015-08-221-7/+27
* | | | Update post_process_dist.shFeng Xiao2015-08-261-5/+1
* | | | Merge pull request #751 from xfxyjwf/version_numberFeng Xiao2015-08-2610-14/+14
|\ \ \ \
| * | | | Update version number.Feng Xiao2015-08-2610-14/+14
* | | | | Merge pull request #752 from google/jtattermusch-patch-1Feng Xiao2015-08-261-7/+12
|\ \ \ \ \
| * | | | | Update README.md for C#Jan Tattermusch2015-08-261-7/+12
|/ / / / /
* | | | | Merge pull request #749 from xfxyjwf/mingw_endianFeng Xiao2015-08-261-2/+5
|\ \ \ \ \
| * | | | | Add a TODO to clean-up the LITTLE_ENDIAN macro.Feng Xiao2015-08-261-0/+3
| * | | | | Assume LITTLE_ENDIAN for windows build.Feng Xiao2015-08-261-2/+2
|/ / / / /
* | | | | Merge pull request #748 from xfxyjwf/unused_typedefFeng Xiao2015-08-261-6/+0
|\| | | |
| * | | | Remove an unused typedef.Feng Xiao2015-08-261-6/+0
|/ / / /
* | | | Merge remote-tracking branch 'origin/master' into beta-1Feng Xiao2015-08-262-1/+14
|\| | |
| * | | Merge pull request #709 from xfxyjwf/map_bugFeng Xiao2015-08-262-1/+14
| |\ \ \
| | * | | Fix map fields parsing.Feng Xiao2015-08-112-1/+14
| * | | | Merge pull request #739 from jtattermusch/include_descriptor_proto_masterJon Skeet2015-08-261-0/+1
| |\ \ \ \
| | * | | | include descriptor.proto in nuget packageJan Tattermusch2015-08-251-0/+1
* | | | | | Merge pull request #747 from jtattermusch/sign_mismatchFeng Xiao2015-08-261-1/+1
|\ \ \ \ \ \
| * | | | | | add static cast to silence signedness comparison warningJan Tattermusch2015-08-261-1/+1
|/ / / / / /
* | | | | | Merge pull request #744 from xfxyjwf/cmake_linuxFeng Xiao2015-08-261-2/+4
|\ \ \ \ \ \
| * | | | | | Fix cmake build on linux.Feng Xiao2015-08-251-2/+4
* | | | | | | Merge pull request #736 from jtattermusch/fix-descriptor-protoJan Tattermusch2015-08-260-0/+0
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | |
| * | | | | | Remove extraneous TODOJon Skeet2015-08-251-1/+0
| * | | | | | Change where we rename Descriptor.cs to DescriptorProtoFile.cs.Jon Skeet2015-08-255-123/+122
* | | | | | | Merge pull request #738 from jtattermusch/include_descriptor_protoJon Skeet2015-08-261-0/+1
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | |
| * | | | | | include descriptor.proto in nuget packageJan Tattermusch2015-08-251-0/+1
| |/ / / / /
* | | | | | Merge pull request #742 from xfxyjwf/c11_compileFeng Xiao2015-08-252-3/+3
|\ \ \ \ \ \
| * | | | | | Fix compile issues with -std=c++11Feng Xiao2015-08-252-3/+3
* | | | | | | Merge pull request #741 from pherl/beta-1Jisi Liu2015-08-254-52/+72
|\ \ \ \ \ \ \
| * | | | | | | fix "memory leaks" in protostream-object files.Jisi Liu2015-08-254-52/+72
* | | | | | | | Merge pull request #740 from pherl/beta-1Jisi Liu2015-08-251-5/+5
|\| | | | | | | | |/ / / / / / |/| | | | | |