Commit message (Expand) | Author | Age | ||
---|---|---|---|---|
... | ||||
| * | | | | Fix bugs for objectivec | 2015-08-26 | ||
* | | | | | Merge branch 'master' of github.com:google/protobuf into beta-1 | 2015-08-26 | ||
|\ \ \ \ \ | | |/ / / | |/| | | | ||||
| * | | | | Merge pull request #728 from dano/py3_str_compat | 2015-08-26 | ||
| |\ \ \ \ | ||||
* | | | | | | Update post_process_dist.sh | 2015-08-26 | ||
* | | | | | | Merge pull request #751 from xfxyjwf/version_number | 2015-08-26 | ||
|\ \ \ \ \ \ | ||||
* \ \ \ \ \ \ | Merge pull request #752 from google/jtattermusch-patch-1 | 2015-08-26 | ||
|\ \ \ \ \ \ \ | ||||
| * | | | | | | | Update README.md for C# | 2015-08-26 | ||
|/ / / / / / / | ||||
| * | | | | | | Update version number. | 2015-08-26 | ||
* | | | | | | | Merge pull request #749 from xfxyjwf/mingw_endian | 2015-08-26 | ||
|\ \ \ \ \ \ \ | ||||
| * | | | | | | | Add a TODO to clean-up the LITTLE_ENDIAN macro. | 2015-08-26 | ||
| * | | | | | | | Assume LITTLE_ENDIAN for windows build. | 2015-08-26 | ||
|/ / / / / / / | ||||
* | | | | | | | Merge pull request #748 from xfxyjwf/unused_typedef | 2015-08-26 | ||
|\| | | | | | | ||||
| * | | | | | | Remove an unused typedef. | 2015-08-26 | ||
|/ / / / / / | ||||
* | | | | | | Merge remote-tracking branch 'origin/master' into beta-1 | 2015-08-26 | ||
|\| | | | | | ||||
| * | | | | | Merge pull request #709 from xfxyjwf/map_bug | 2015-08-26 | ||
| |\ \ \ \ \ | ||||
* | \ \ \ \ \ | Merge pull request #747 from jtattermusch/sign_mismatch | 2015-08-26 | ||
|\ \ \ \ \ \ \ | ||||
| * | | | | | | | add static cast to silence signedness comparison warning | 2015-08-26 | ||
|/ / / / / / / | ||||
| | | | | * / | Fix the no-op definitions of GOOGLE_PREDICT_{TRUE,FALSE} | 2015-08-26 | ||
| | |_|_|/ / | |/| | | | | ||||
* | | | | | | Merge pull request #744 from xfxyjwf/cmake_linux | 2015-08-26 | ||
|\ \ \ \ \ \ | ||||
* \ \ \ \ \ \ | Merge pull request #736 from jtattermusch/fix-descriptor-proto | 2015-08-26 | ||
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | ||||
| | * | | | | | Fix cmake build on linux. | 2015-08-25 | ||
* | | | | | | | Merge pull request #738 from jtattermusch/include_descriptor_proto | 2015-08-26 | ||
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | ||||
| | | * | | | | Merge pull request #739 from jtattermusch/include_descriptor_proto_master | 2015-08-26 | ||
| | | |\ \ \ \ | ||||
* | | | \ \ \ \ | Merge pull request #742 from xfxyjwf/c11_compile | 2015-08-25 | ||
|\ \ \ \ \ \ \ \ | ||||
| * | | | | | | | | Fix compile issues with -std=c++11 | 2015-08-25 | ||
* | | | | | | | | | Merge pull request #741 from pherl/beta-1 | 2015-08-25 | ||
|\ \ \ \ \ \ \ \ \ | ||||
| * | | | | | | | | | fix "memory leaks" in protostream-object files. | 2015-08-25 | ||
* | | | | | | | | | | Merge pull request #740 from pherl/beta-1 | 2015-08-25 | ||
|\| | | | | | | | | | |/ / / / / / / / |/| | | | | | | | | ||||
| * | | | | | | | | Fix commandline interface file under heapcheck. | 2015-08-25 | ||
* | | | | | | | | | Merge remote-tracking branch 'origin/master' into beta-1 | 2015-08-25 | ||
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | / / / / / | | |_|/ / / / / | |/| | | | | | | ||||
| | | | * | | | | include descriptor.proto in nuget package | 2015-08-25 | ||
| | * | | | | | | include descriptor.proto in nuget package | 2015-08-25 | ||
| |/ / / / / / |/| | | | | | | ||||
| * | | | | | | Merge pull request #726 from DouglasHeriot/msvc-noinline | 2015-08-25 | ||
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | ||||
| | | * | | | | Remove extraneous TODO | 2015-08-25 | ||
| | | * | | | | Change where we rename Descriptor.cs to DescriptorProtoFile.cs. | 2015-08-25 | ||
| |_|/ / / / |/| | | | | | ||||
* | | | | | | Merge pull request #734 from TeBoring/beta-1 | 2015-08-25 | ||
|\ \ \ \ \ \ | ||||
| * | | | | | | Fix bugs on windows | 2015-08-25 | ||
* | | | | | | | Merge pull request #735 from pherl/beta-1 | 2015-08-25 | ||
|\ \ \ \ \ \ \ | ||||
| * | | | | | | | Update cmake and BUILD files. | 2015-08-25 | ||
|/ / / / / / / | ||||
* | | | | | | | Merge branch 'beta-1' of github.com:google/protobuf into manual-merge | 2015-08-25 | ||
|\ \ \ \ \ \ \ | ||||
* | | | | | | | | Update descriptor protos. | 2015-08-25 | ||
* | | | | | | | | Merge branch 'beta-1' of github.com:google/protobuf into manual-merge | 2015-08-25 | ||
|\ \ \ \ \ \ \ \ | ||||
| | * | | | | | | | Make the PARSER @Deprecated public. | 2015-08-25 | ||
| |/ / / / / / / | ||||
* | | | | | | | | Merge branch 'gcc-c++11-fix' of https://github.com/nsuke/protobuf into beta-1 | 2015-08-25 | ||
|\ \ \ \ \ \ \ \ | ||||
| | * | | | | | | | Delete incorrectly placed test file. | 2015-08-25 | ||
| | * | | | | | | | Merge Java util package to github. | 2015-08-25 | ||
| | |/ / / / / / | ||||
| | | * | | | | | Merge pull request #732 from jskeet/fix-descriptor-proto | 2015-08-25 | ||
| | | |\ \ \ \ \ | ||||
| | | | * | | | | | Remove extraneous TODO | 2015-08-25 | ||
| | | | * | | | | | Change where we rename Descriptor.cs to DescriptorProtoFile.cs. | 2015-08-25 | ||
| | | |/ / / / / | ||||
| | * | | | | | | Cherry-pick Java utf8 change. | 2015-08-24 |