aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
Commit message (Expand)AuthorAge
* Improved testing from CMake projectGravatar Konstantin Podsvirov2015-09-15
* Merge remote-tracking branch 'origin/master' into beta-1Gravatar Feng Xiao2015-08-29
|\
| * Merge pull request #770 from pkasting/string_spaceGravatar Feng Xiao2015-08-28
| |\
| * \ Merge pull request #771 from pkasting/static_init_1Gravatar Feng Xiao2015-08-28
| |\ \
| * \ \ Merge pull request #569 from redivo/masterGravatar Feng Xiao2015-08-28
| |\ \ \
| * \ \ \ Merge pull request #768 from pkasting/timeGravatar Feng Xiao2015-08-28
| |\ \ \ \
| | | | * | Remove a static initializer by removing a global of non-POD type.Gravatar Peter Kasting2015-08-27
| | |_|/ / | |/| | |
| * | | | Merge pull request #746 from zmodem/fix_predict_macros2Gravatar Feng Xiao2015-08-27
| |\ \ \ \
| | | | | * Move StringSpaceUsedIncludingSelf to lite library.Gravatar Peter Kasting2015-08-27
| | | * | | Delete kNanosPerSecond from time.cc.Gravatar Peter Kasting2015-08-27
| | | | |/ | | | |/|
| * | / | Avoid #including system headers from inside a namespace.Gravatar Peter Kasting2015-08-27
| | |/ / | |/| |
* | | | Update generated file.Gravatar Feng Xiao2015-08-26
* | | | Merge pull request #750 from TeBoring/beta-1Gravatar Paul Yang2015-08-26
|\ \ \ \
| * | | | Fix bugs for objectivecGravatar TeBoring2015-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
* | | | | 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
| |\ \ \ \
* | | | | | 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
| | |_|/ / | |/| | |
* | | | | Fix cmake build on linux.Gravatar Feng Xiao2015-08-25
| |_|/ / |/| | |
* | | | 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
|\ \ \ \ \ | |/ / / / |/| / / / | |/ / /
| * | | Merge pull request #726 from DouglasHeriot/msvc-noinlineGravatar Feng Xiao2015-08-25
| |\ \ \
* | \ \ \ Merge pull request #734 from TeBoring/beta-1Gravatar Feng Xiao2015-08-25
|\ \ \ \ \
| * | | | | Fix bugs on windowsGravatar Bo Yang2015-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
|\ \ \ \ \ \
| | | * | | | 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
| |/ / / / / |/| | | | |
| | * | | | Remove Python 2.5 cruftGravatar Tamir Duberstein2015-08-22
* | | | | | Merge branch 'master' of github.com:google/protobufGravatar Jisi Liu2015-08-21
|\ \ \ \ \ \ | | |/ / / / | |/| | | |
* | | | | | Down-integrate from internal branch.Gravatar Jisi Liu2015-08-21
| | | * | | Define GOOGLE_ATTRIBUTE_NOINLINE for MSVC. Workaround for VS2015 Release buil...Gravatar Douglas Heriot2015-08-22
| | |/ / / | |/| | |
| * | | | Merge pull request #720 from jtattermusch/csharp_fixesGravatar Jon Skeet2015-08-14
| |\ \ \ \
| | * | | | fix type initialization problem with FileDescriptorGravatar Jan Tattermusch2015-08-14
| * | | | | Merge pull request #571 from thomasvl/validation_supportGravatar Paul Yang2015-08-14
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Add support for a file listing expected package to objc prefixes for validation.Gravatar Thomas Van Lenten2015-08-14
| * | | | | Allow public access to descriptor.proto as a dependency.Gravatar Jon Skeet2015-08-13
| |/ / / /