aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Expand)AuthorAge
* Update generated file.Gravatar Feng Xiao2015-08-26
* Fix merge conflict.Gravatar Feng Xiao2015-08-26
* Merge pull request #756 from TeBoring/beta-1Gravatar Feng Xiao2015-08-26
|\
* \ Update Makefile.am to include missing files.Gravatar Feng Xiao2015-08-26
|\ \
| * | Add missing files in dist.Gravatar Feng Xiao2015-08-26
| | * Add distribution for objcGravatar Bo Yang2015-08-26
* | | Merge pull request #755 from pherl/beta-1Gravatar Jisi Liu2015-08-26
|\ \ \
| * | | Add bazel build/workspace into distribution.Gravatar Jisi Liu2015-08-26
|/ / /
* | | Merge pull request #754 from xfxyjwf/changelogGravatar Feng Xiao2015-08-26
|\ \ \ | |_|/ |/| |
| * | Update change log for beta-1.Gravatar Feng Xiao2015-08-26
* | | Merge pull request #750 from TeBoring/beta-1Gravatar Paul Yang2015-08-26
|\ \ \ | |/ / |/| |
| * | Fix bugs for objectivecGravatar TeBoring2015-08-26
* | | Merge branch 'master' of github.com:google/protobuf into beta-1Gravatar Feng Xiao2015-08-26
|\ \ \ | | |/ | |/|
| * | Merge pull request #728 from dano/py3_str_compatGravatar Joshua Haberman2015-08-26
| |\ \
* | | | Update post_process_dist.shGravatar Feng Xiao2015-08-26
* | | | Merge pull request #751 from xfxyjwf/version_numberGravatar Feng Xiao2015-08-26
|\ \ \ \
* \ \ \ \ Merge pull request #752 from google/jtattermusch-patch-1Gravatar Feng Xiao2015-08-26
|\ \ \ \ \
| * | | | | Update README.md for C#Gravatar Jan Tattermusch2015-08-26
|/ / / / /
| * | | | Update version number.Gravatar Feng Xiao2015-08-26
* | | | | Merge pull request #749 from xfxyjwf/mingw_endianGravatar Feng Xiao2015-08-26
|\ \ \ \ \
| * | | | | Add a TODO to clean-up the LITTLE_ENDIAN macro.Gravatar Feng Xiao2015-08-26
| * | | | | Assume LITTLE_ENDIAN for windows build.Gravatar Feng Xiao2015-08-26
|/ / / / /
* | | | | Merge pull request #748 from xfxyjwf/unused_typedefGravatar Feng Xiao2015-08-26
|\| | | |
| * | | | Remove an unused typedef.Gravatar Feng Xiao2015-08-26
|/ / / /
* | | | Merge remote-tracking branch 'origin/master' into beta-1Gravatar Feng Xiao2015-08-26
|\| | |
| * | | Merge pull request #709 from xfxyjwf/map_bugGravatar Feng Xiao2015-08-26
| |\ \ \
* | \ \ \ Merge pull request #747 from jtattermusch/sign_mismatchGravatar Feng Xiao2015-08-26
|\ \ \ \ \
| * | | | | add static cast to silence signedness comparison warningGravatar Jan Tattermusch2015-08-26
|/ / / / /
* | | | | Merge pull request #744 from xfxyjwf/cmake_linuxGravatar Feng Xiao2015-08-26
|\ \ \ \ \
* \ \ \ \ \ Merge pull request #736 from jtattermusch/fix-descriptor-protoGravatar Jan Tattermusch2015-08-26
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| | * | | | Fix cmake build on linux.Gravatar Feng Xiao2015-08-25
* | | | | | Merge pull request #738 from jtattermusch/include_descriptor_protoGravatar Jon Skeet2015-08-26
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| | | * | | Merge pull request #739 from jtattermusch/include_descriptor_proto_masterGravatar Jon Skeet2015-08-26
| | | |\ \ \
* | | | \ \ \ Merge pull request #742 from xfxyjwf/c11_compileGravatar Feng Xiao2015-08-25
|\ \ \ \ \ \ \
| * | | | | | | Fix compile issues with -std=c++11Gravatar Feng Xiao2015-08-25
* | | | | | | | Merge pull request #741 from pherl/beta-1Gravatar Jisi Liu2015-08-25
|\ \ \ \ \ \ \ \
| * | | | | | | | fix "memory leaks" in protostream-object files.Gravatar Jisi Liu2015-08-25
* | | | | | | | | Merge pull request #740 from pherl/beta-1Gravatar Jisi Liu2015-08-25
|\| | | | | | | | | |/ / / / / / / |/| | | | | | |
| * | | | | | | Fix commandline interface file under heapcheck.Gravatar Jisi Liu2015-08-25
* | | | | | | | Merge remote-tracking branch 'origin/master' into beta-1Gravatar Feng Xiao2015-08-25
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | / / / / | | |_|/ / / / | |/| | | | |
| | | | * | | include descriptor.proto in nuget packageGravatar Jan Tattermusch2015-08-25
| | * | | | | include descriptor.proto in nuget packageGravatar Jan Tattermusch2015-08-25
| |/ / / / / |/| | | | |
| * | | | | Merge pull request #726 from DouglasHeriot/msvc-noinlineGravatar Feng Xiao2015-08-25
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | | * | | Remove extraneous TODOGravatar Jon Skeet2015-08-25
| | | * | | Change where we rename Descriptor.cs to DescriptorProtoFile.cs.Gravatar Jon Skeet2015-08-25
| |_|/ / / |/| | | |
* | | | | Merge pull request #734 from TeBoring/beta-1Gravatar Feng Xiao2015-08-25
|\ \ \ \ \
| * | | | | Fix bugs on windowsGravatar Bo Yang2015-08-25
* | | | | | Merge pull request #735 from pherl/beta-1Gravatar Jisi Liu2015-08-25
|\ \ \ \ \ \
| * | | | | | Update cmake and BUILD files.Gravatar Jisi Liu2015-08-25
|/ / / / / /
* | | | | | Merge branch 'beta-1' of github.com:google/protobuf into manual-mergeGravatar Jisi Liu2015-08-25
|\ \ \ \ \ \