Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | Merge remote-tracking branch 'origin/master' into beta-1 | Feng Xiao | 2015-08-26 | 2 | -1/+14 | |
|\ \ \ \ \ | | |/ / / | |/| | | | ||||||
| * | | | | Merge pull request #709 from xfxyjwf/map_bug | Feng Xiao | 2015-08-26 | 2 | -1/+14 | |
| |\ \ \ \ | | |_|/ / | |/| | | | ||||||
| | * | | | Fix map fields parsing. | Feng Xiao | 2015-08-11 | 2 | -1/+14 | |
* | | | | | add static cast to silence signedness comparison warning | Jan Tattermusch | 2015-08-26 | 1 | -1/+1 | |
* | | | | | Fix cmake build on linux. | Feng Xiao | 2015-08-25 | 1 | -2/+4 | |
| |_|/ / |/| | | | ||||||
* | | | | Merge pull request #742 from xfxyjwf/c11_compile | Feng Xiao | 2015-08-25 | 2 | -3/+3 | |
|\ \ \ \ | ||||||
| * | | | | Fix compile issues with -std=c++11 | Feng Xiao | 2015-08-25 | 2 | -3/+3 | |
* | | | | | Merge pull request #741 from pherl/beta-1 | Jisi Liu | 2015-08-25 | 4 | -52/+72 | |
|\ \ \ \ \ | ||||||
| * | | | | | fix "memory leaks" in protostream-object files. | Jisi Liu | 2015-08-25 | 4 | -52/+72 | |
* | | | | | | Merge pull request #740 from pherl/beta-1 | Jisi Liu | 2015-08-25 | 1 | -5/+5 | |
|\| | | | | | |/ / / / |/| | | | | ||||||
| * | | | | Fix commandline interface file under heapcheck. | Jisi Liu | 2015-08-25 | 1 | -5/+5 | |
* | | | | | Merge remote-tracking branch 'origin/master' into beta-1 | Feng Xiao | 2015-08-25 | 5 | -20/+21 | |
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / / | ||||||
| * | | | Merge pull request #726 from DouglasHeriot/msvc-noinline | Feng Xiao | 2015-08-25 | 6 | -23/+31 | |
| |\ \ \ | ||||||
| | * | | | Define GOOGLE_ATTRIBUTE_NOINLINE for MSVC. Workaround for VS2015 Release buil... | Douglas Heriot | 2015-08-22 | 6 | -23/+31 | |
| * | | | | Change where we rename Descriptor.cs to DescriptorProtoFile.cs. | Jon Skeet | 2015-08-25 | 2 | -6/+7 | |
| * | | | | Remove Python 2.5 cruft | Tamir Duberstein | 2015-08-22 | 1 | -14/+6 | |
| |/ / / | ||||||
* | | | | Merge pull request #734 from TeBoring/beta-1 | Feng Xiao | 2015-08-25 | 19 | -61/+110 | |
|\ \ \ \ | ||||||
| * | | | | Fix bugs on windows | Bo Yang | 2015-08-25 | 32 | -437/+503 | |
* | | | | | Merge branch 'beta-1' of github.com:google/protobuf into manual-merge | Jisi Liu | 2015-08-25 | 2 | -2/+11 | |
|\ \ \ \ \ | ||||||
| * | | | | | Make the PARSER @Deprecated public. | Feng Xiao | 2015-08-25 | 2 | -2/+11 | |
| |/ / / / | ||||||
* | | | | | Update descriptor protos. | Jisi Liu | 2015-08-25 | 13 | -376/+393 | |
* | | | | | Merge branch 'beta-1' of github.com:google/protobuf into manual-merge | Jisi Liu | 2015-08-25 | 171 | -2737/+6924 | |
|\| | | | | ||||||
| * | | | | Cherry-pick Java utf8 change. | Feng Xiao | 2015-08-24 | 3 | -8/+5 | |
| * | | | | Down-integrate from internal code base. | Feng Xiao | 2015-08-23 | 11 | -112/+418 | |
| * | | | | Down-integrate from google3. | Feng Xiao | 2015-08-22 | 168 | -2618/+6502 | |
* | | | | | Merge branch 'gcc-c++11-fix' of https://github.com/nsuke/protobuf into beta-1 | Jisi Liu | 2015-08-25 | 2 | -9/+4 | |
|\ \ \ \ \ | |/ / / / |/| | | | | ||||||
| * | | | | Fix gcc C++11 build | Nobuaki Sukegawa | 2015-08-01 | 2 | -9/+4 | |
* | | | | | Merge branch 'master' of github.com:google/protobuf | Jisi Liu | 2015-08-21 | 100 | -2549/+2495 | |
|\ \ \ \ \ | | |/ / / | |/| | | | ||||||
| * | | | | Merge pull request #720 from jtattermusch/csharp_fixes | Jon Skeet | 2015-08-14 | 1 | -1/+1 | |
| |\ \ \ \ | ||||||
| | * | | | | fix type initialization problem with FileDescriptor | Jan Tattermusch | 2015-08-14 | 1 | -1/+1 | |
| * | | | | | Merge pull request #571 from thomasvl/validation_support | Paul Yang | 2015-08-14 | 5 | -90/+287 | |
| |\ \ \ \ \ | | |/ / / / | |/| | | | | ||||||
| | * | | | | Add support for a file listing expected package to objc prefixes for validation. | Thomas Van Lenten | 2015-08-14 | 5 | -90/+287 | |
| | | |/ / | | |/| | | ||||||
| * / | | | Allow public access to descriptor.proto as a dependency. | Jon Skeet | 2015-08-13 | 2 | -2/+12 | |
| |/ / / | ||||||
| * | | | Merge pull request #700 from jskeet/remove-packed-hack | Jan Tattermusch | 2015-08-08 | 2 | -12/+1 | |
| |\ \ \ | ||||||
| | * | | | Remove our own version of MakeTag now that the main one is fixed. | Jon Skeet | 2015-08-07 | 2 | -12/+1 | |
| * | | | | Merge pull request #694 from jskeet/groups | Jon Skeet | 2015-08-08 | 1 | -4/+1 | |
| |\ \ \ \ | | |/ / / | |/| | | | ||||||
| | * | | | Skip groups properly. | Jon Skeet | 2015-08-06 | 1 | -4/+1 | |
| * | | | | Merge pull request #645 from zsurocking/master | Paul Yang | 2015-08-06 | 15 | -81/+202 | |
| |\ \ \ \ | ||||||
| | * \ \ \ | Merge remote-tracking branch 'upstream/master' | Xiao Hang | 2015-08-04 | 88 | -2378/+2035 | |
| | |\ \ \ \ | ||||||
| | * | | | | | Generate a package name suffix ".nano" for nano messages | Xiao Hang | 2015-07-29 | 5 | -58/+174 | |
| * | | | | | | Remove unused .pb.h #includes. | Bo Yang | 2015-08-06 | 4 | -4/+0 | |
| | |_|/ / / | |/| | | | | ||||||
| * | | | | | Change ReadTag and PeekTag to just use 0 as a return value for "end of stream... | Jon Skeet | 2015-08-05 | 1 | -3/+1 | |
| * | | | | | Consume unknown fields when parsing. | Jon Skeet | 2015-08-05 | 1 | -1/+2 | |
| | |/ / / | |/| | | | ||||||
| * | | | | Merge pull request #653 from airtimemedia/master | Feng Xiao | 2015-08-03 | 6 | -13/+7 | |
| |\ \ \ \ | | |_|/ / | |/| | | | ||||||
| | * | | | Move pthread include. | Tom Hughes | 2015-07-30 | 2 | -2/+4 | |
| | * | | | Remove unused private fields. | Tom Hughes | 2015-07-29 | 4 | -12/+2 | |
| | * | | | Fix compilation error when using C++11. | Tom Hughes | 2015-07-29 | 1 | -1/+1 | |
| | * | | | Include pthread.h when using GOOGLE_PROTOBUF_NO_THREADLOCAL. | Tom Hughes | 2015-07-28 | 1 | -0/+2 | |
| | |/ / | ||||||
| * | | | Merge pull request #643 from yukawa/fix_win_unicode_build | Paul Yang | 2015-07-31 | 1 | -1/+1 | |
| |\ \ \ | ||||||
| | * | | | Fix build failure on Windows when Unicode build is enabled. | Yohei Yukawa | 2015-07-30 | 1 | -1/+1 |