| Commit message (Expand) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Down-integrate from google internal. | Jisi Liu | 2015-10-05 | 62 | -359/+1325 |
| * | Merge remote-tracking branch 'origin/master' into beta-1 | Feng Xiao | 2015-08-29 | 9 | -96/+109 |
| |\ | |||||
| | * | Merge pull request #770 from pkasting/string_space | Feng Xiao | 2015-08-28 | 4 | -19/+14 |
| | |\ | |||||
| | | * | Move StringSpaceUsedIncludingSelf to lite library. | Peter Kasting | 2015-08-27 | 4 | -19/+14 |
| | * | | Merge pull request #771 from pkasting/static_init_1 | Feng Xiao | 2015-08-28 | 2 | -63/+78 |
| | |\ \ | |||||
| | | * | | Remove a static initializer by removing a global of non-POD type. | Peter Kasting | 2015-08-27 | 2 | -63/+78 |
| | * | | | Merge pull request #569 from redivo/master | Feng Xiao | 2015-08-28 | 1 | -5/+5 |
| | |\ \ \ | |||||
| | | * | | | Fix GOOGLE_PROTOBUF_ATOMICOPS_ERROR syntax error | George Redivo | 2015-07-06 | 1 | -5/+5 |
| | * | | | | Merge pull request #768 from pkasting/time | Feng Xiao | 2015-08-28 | 1 | -1/+0 |
| | |\ \ \ \ | | |_|/ / | |/| | | | |||||
| | | * | | | Delete kNanosPerSecond from time.cc. | Peter Kasting | 2015-08-27 | 1 | -1/+0 |
| | | | |/ | | |/| | |||||
| | * | | | Merge pull request #746 from zmodem/fix_predict_macros2 | Feng Xiao | 2015-08-27 | 1 | -2/+2 |
| | |\ \ \ | |||||
| | | * | | | Fix the no-op definitions of GOOGLE_PREDICT_{TRUE,FALSE} | Hans Wennborg | 2015-08-26 | 1 | -2/+2 |
| | * | | | | Avoid #including system headers from inside a namespace. | Peter Kasting | 2015-08-27 | 1 | -6/+10 |
| | | |/ / | |/| | | |||||
| * | | | | Update generated file. | Feng Xiao | 2015-08-26 | 1 | -1/+0 |
| * | | | | Merge pull request #750 from TeBoring/beta-1 | Paul Yang | 2015-08-26 | 1 | -0/+1 |
| |\ \ \ \ | |||||
| | * | | | | Fix bugs for objectivec | TeBoring | 2015-08-26 | 1 | -0/+1 |
| * | | | | | Add a TODO to clean-up the LITTLE_ENDIAN macro. | Feng Xiao | 2015-08-26 | 1 | -0/+3 |
| * | | | | | Assume LITTLE_ENDIAN for windows build. | Feng Xiao | 2015-08-26 | 1 | -2/+2 |
| * | | | | | Remove an unused typedef. | Feng Xiao | 2015-08-26 | 1 | -6/+0 |
| * | | | | | 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 |
| | |\ \ \ \ \ | | |/ / / / | |/| | | | | |||||
 |
index : protobuf | |
| Protocol Buffers - Google's data interchange format |
| aboutsummaryrefslogtreecommitdiff |