Commit message (Expand) | Author | Age | ||
---|---|---|---|---|
... | ||||
* | | | | | | | Merge pull request #749 from xfxyjwf/mingw_endian | Feng Xiao | 2015-08-26 | |
|\ \ \ \ \ \ \ | ||||
| * | | | | | | | Add a TODO to clean-up the LITTLE_ENDIAN macro. | Feng Xiao | 2015-08-26 | |
| * | | | | | | | Assume LITTLE_ENDIAN for windows build. | Feng Xiao | 2015-08-26 | |
|/ / / / / / / | ||||
* | | | | | | | Merge pull request #748 from xfxyjwf/unused_typedef | Feng Xiao | 2015-08-26 | |
|\| | | | | | | ||||
| * | | | | | | Remove an unused typedef. | Feng Xiao | 2015-08-26 | |
|/ / / / / / | ||||
* | | | | | | Merge remote-tracking branch 'origin/master' into beta-1 | Feng Xiao | 2015-08-26 | |
|\| | | | | | ||||
| * | | | | | Merge pull request #709 from xfxyjwf/map_bug | Feng Xiao | 2015-08-26 | |
| |\ \ \ \ \ | ||||
* | \ \ \ \ \ | Merge pull request #747 from jtattermusch/sign_mismatch | Feng Xiao | 2015-08-26 | |
|\ \ \ \ \ \ \ | ||||
| * | | | | | | | add static cast to silence signedness comparison warning | Jan Tattermusch | 2015-08-26 | |
|/ / / / / / / | ||||
| | | | | * / | Fix the no-op definitions of GOOGLE_PREDICT_{TRUE,FALSE} | Hans Wennborg | 2015-08-26 | |
| | |_|_|/ / | |/| | | | | ||||
* | | | | | | Merge pull request #744 from xfxyjwf/cmake_linux | Feng Xiao | 2015-08-26 | |
|\ \ \ \ \ \ | ||||
* \ \ \ \ \ \ | Merge pull request #736 from jtattermusch/fix-descriptor-proto | Jan Tattermusch | 2015-08-26 | |
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | | | ||||
| | * | | | | | Fix cmake build on linux. | Feng Xiao | 2015-08-25 | |
* | | | | | | | Merge pull request #738 from jtattermusch/include_descriptor_proto | Jon Skeet | 2015-08-26 | |
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | | | | | | ||||
| | | * | | | | Merge pull request #739 from jtattermusch/include_descriptor_proto_master | Jon Skeet | 2015-08-26 | |
| | | |\ \ \ \ | ||||
* | | | \ \ \ \ | Merge pull request #742 from xfxyjwf/c11_compile | Feng Xiao | 2015-08-25 | |
|\ \ \ \ \ \ \ \ | ||||
| * | | | | | | | | Fix compile issues with -std=c++11 | Feng Xiao | 2015-08-25 | |
* | | | | | | | | | Merge pull request #741 from pherl/beta-1 | Jisi Liu | 2015-08-25 | |
|\ \ \ \ \ \ \ \ \ | ||||
| * | | | | | | | | | fix "memory leaks" in protostream-object files. | Jisi Liu | 2015-08-25 | |
* | | | | | | | | | | Merge pull request #740 from pherl/beta-1 | Jisi Liu | 2015-08-25 | |
|\| | | | | | | | | | |/ / / / / / / / |/| | | | | | | | | ||||
| * | | | | | | | | Fix commandline interface file under heapcheck. | Jisi Liu | 2015-08-25 | |
* | | | | | | | | | Merge remote-tracking branch 'origin/master' into beta-1 | Feng Xiao | 2015-08-25 | |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | / / / / / | | |_|/ / / / / | |/| | | | | | | ||||
| | | | * | | | | include descriptor.proto in nuget package | Jan Tattermusch | 2015-08-25 | |
| | * | | | | | | include descriptor.proto in nuget package | Jan Tattermusch | 2015-08-25 | |
| |/ / / / / / |/| | | | | | | ||||
| * | | | | | | Merge pull request #726 from DouglasHeriot/msvc-noinline | Feng Xiao | 2015-08-25 | |
| |\ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | ||||
| | | * | | | | Remove extraneous TODO | Jon Skeet | 2015-08-25 | |
| | | * | | | | Change where we rename Descriptor.cs to DescriptorProtoFile.cs. | Jon Skeet | 2015-08-25 | |
| |_|/ / / / |/| | | | | | ||||
* | | | | | | Merge pull request #734 from TeBoring/beta-1 | Feng Xiao | 2015-08-25 | |
|\ \ \ \ \ \ | ||||
| * | | | | | | Fix bugs on windows | Bo Yang | 2015-08-25 | |
* | | | | | | | Merge pull request #735 from pherl/beta-1 | Jisi Liu | 2015-08-25 | |
|\ \ \ \ \ \ \ | ||||
| * | | | | | | | Update cmake and BUILD files. | Jisi Liu | 2015-08-25 | |
|/ / / / / / / | ||||
* | | | | | | | Merge branch 'beta-1' of github.com:google/protobuf into manual-merge | Jisi Liu | 2015-08-25 | |
|\ \ \ \ \ \ \ | ||||
* | | | | | | | | Update descriptor protos. | Jisi Liu | 2015-08-25 | |
* | | | | | | | | Merge branch 'beta-1' of github.com:google/protobuf into manual-merge | Jisi Liu | 2015-08-25 | |
|\ \ \ \ \ \ \ \ | ||||
| | * | | | | | | | Make the PARSER @Deprecated public. | Feng Xiao | 2015-08-25 | |
| |/ / / / / / / | ||||
* | | | | | | | | Merge branch 'gcc-c++11-fix' of https://github.com/nsuke/protobuf into beta-1 | Jisi Liu | 2015-08-25 | |
|\ \ \ \ \ \ \ \ | ||||
| | * | | | | | | | Delete incorrectly placed test file. | Feng Xiao | 2015-08-25 | |
| | * | | | | | | | Merge Java util package to github. | Feng Xiao | 2015-08-25 | |
| | |/ / / / / / | ||||
| | | * | | | | | Merge pull request #732 from jskeet/fix-descriptor-proto | Jon Skeet | 2015-08-25 | |
| | | |\ \ \ \ \ | ||||
| | | | * | | | | | Remove extraneous TODO | Jon Skeet | 2015-08-25 | |
| | | | * | | | | | Change where we rename Descriptor.cs to DescriptorProtoFile.cs. | Jon Skeet | 2015-08-25 | |
| | | |/ / / / / | ||||
| | * | | | | | | Cherry-pick Java utf8 change. | Feng Xiao | 2015-08-24 | |
| | * | | | | | | Down-integrate from internal code base. | Feng Xiao | 2015-08-23 | |
| | * | | | | | | Down-integrate from google3. | Feng Xiao | 2015-08-22 | |
| |/ / / / / / |/| | | | | | | ||||
| | * | | | | | Merge pull request #711 from tamird/python3-prep | Joshua Haberman | 2015-08-22 | |
| | |\ \ \ \ \ | ||||
| | | | | | * | | Fix metaclass issue on Python 3. Get text handling tests passing on Python 3. | Dan O'Reilly | 2015-08-22 | |
| | | | | | * | | Start work on getting text handled properly on PY3 | Dan O'Reilly | 2015-08-22 | |
| | | |_|_|/ / | | |/| | | | | ||||
| | | * | | | | assertEquals is deprecated | Tamir Duberstein | 2015-08-22 | |
| | | * | | | | Use assertIsInstance | Tamir Duberstein | 2015-08-22 | |
| | | * | | | | Clean up exception syntax | Tamir Duberstein | 2015-08-22 |