aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Expand)AuthorAge
...
* | | | | | | 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
|/ / / / / / /
| | | | | * / Fix the no-op definitions of GOOGLE_PREDICT_{TRUE,FALSE}Gravatar Hans Wennborg2015-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
|\ \ \ \ \ \ \
* | | | | | | | Update descriptor protos.Gravatar Jisi Liu2015-08-25
* | | | | | | | Merge branch 'beta-1' of github.com:google/protobuf into manual-mergeGravatar Jisi Liu2015-08-25
|\ \ \ \ \ \ \ \
| | * | | | | | | Make the PARSER @Deprecated public.Gravatar Feng Xiao2015-08-25
| |/ / / / / / /
* | | | | | | | Merge branch 'gcc-c++11-fix' of https://github.com/nsuke/protobuf into beta-1Gravatar Jisi Liu2015-08-25
|\ \ \ \ \ \ \ \
| | * | | | | | | Delete incorrectly placed test file.Gravatar Feng Xiao2015-08-25
| | * | | | | | | Merge Java util package to github.Gravatar Feng Xiao2015-08-25
| | |/ / / / / /
| | | * | | | | Merge pull request #732 from jskeet/fix-descriptor-protoGravatar Jon Skeet2015-08-25
| | | |\ \ \ \ \
| | | | * | | | | Remove extraneous TODOGravatar Jon Skeet2015-08-25
| | | | * | | | | Change where we rename Descriptor.cs to DescriptorProtoFile.cs.Gravatar Jon Skeet2015-08-25
| | | |/ / / / /
| | * | | | | | Cherry-pick Java utf8 change.Gravatar Feng Xiao2015-08-24
| | * | | | | | Down-integrate from internal code base.Gravatar Feng Xiao2015-08-23
| | * | | | | | Down-integrate from google3.Gravatar Feng Xiao2015-08-22
| |/ / / / / / |/| | | | | |
| | * | | | | Merge pull request #711 from tamird/python3-prepGravatar Joshua Haberman2015-08-22
| | |\ \ \ \ \
| | | | | | * | Fix metaclass issue on Python 3. Get text handling tests passing on Python 3.Gravatar Dan O'Reilly2015-08-22
| | | | | | * | Start work on getting text handled properly on PY3Gravatar Dan O'Reilly2015-08-22
| | | |_|_|/ / | | |/| | | |
| | | * | | | assertEquals is deprecatedGravatar Tamir Duberstein2015-08-22
| | | * | | | Use assertIsInstanceGravatar Tamir Duberstein2015-08-22
| | | * | | | Clean up exception syntaxGravatar Tamir Duberstein2015-08-22