aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
Commit message (Expand)AuthorAge
* 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 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
| |/ / /
| | | * Fix map fields parsing.Gravatar Feng Xiao2015-08-11
| | |/ | |/|
| * | Merge pull request #700 from jskeet/remove-packed-hackGravatar Jan Tattermusch2015-08-08
| |\ \
| * \ \ Merge pull request #694 from jskeet/groupsGravatar Jon Skeet2015-08-08
| |\ \ \
| | | * | Remove our own version of MakeTag now that the main one is fixed.Gravatar Jon Skeet2015-08-07
| | |/ / | |/| |
| * | | Merge pull request #645 from zsurocking/masterGravatar Paul Yang2015-08-06
| |\ \ \
| * | | | Remove unused .pb.h #includes.Gravatar Bo Yang2015-08-06
| | | * | Skip groups properly.Gravatar Jon Skeet2015-08-06
| | |/ / | |/| |
| * | | Change ReadTag and PeekTag to just use 0 as a return value for "end of stream...Gravatar Jon Skeet2015-08-05
| * | | Consume unknown fields when parsing.Gravatar Jon Skeet2015-08-05
| | * | Merge remote-tracking branch 'upstream/master'Gravatar Xiao Hang2015-08-04
| | |\ \ | | |/ / | |/| |
| * | | Merge pull request #653 from airtimemedia/masterGravatar Feng Xiao2015-08-03
| |\ \ \
| | | | * Fix gcc C++11 buildGravatar Nobuaki Sukegawa2015-08-01
| | |_|/ | |/| |
| * | | Merge pull request #643 from yukawa/fix_win_unicode_buildGravatar Paul Yang2015-07-31
| |\ \ \
| * | | | Handle field names of "descriptor" and "types".Gravatar Jon Skeet2015-07-31
| | * | | Fix build failure on Windows when Unicode build is enabled.Gravatar Yohei Yukawa2015-07-30
| |/ / / |/| | |
| * | | refactor umbrella class helpersGravatar Jan Tattermusch2015-07-30
| * | | Merge pull request #632 from google/csharp-experimentalGravatar Jan Tattermusch2015-07-30
| |\ \ \