aboutsummaryrefslogtreecommitdiff
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #742 from xfxyjwf/c11_compileFeng Xiao2015-08-252-3/+3
|\
| * Fix compile issues with -std=c++11Feng Xiao2015-08-252-3/+3
* | Merge pull request #741 from pherl/beta-1Jisi Liu2015-08-254-52/+72
|\ \
| * | fix "memory leaks" in protostream-object files.Jisi Liu2015-08-254-52/+72
* | | Merge pull request #740 from pherl/beta-1Jisi Liu2015-08-251-5/+5
|\| | | |/ |/|
| * Fix commandline interface file under heapcheck.Jisi Liu2015-08-251-5/+5
* | Merge remote-tracking branch 'origin/master' into beta-1Feng Xiao2015-08-255-20/+21
|\ \ | |/ |/|
| * Merge pull request #726 from DouglasHeriot/msvc-noinlineFeng Xiao2015-08-256-23/+31
| |\
| | * Define GOOGLE_ATTRIBUTE_NOINLINE for MSVC. Workaround for VS2015 Release buil...Douglas Heriot2015-08-226-23/+31
| * | Change where we rename Descriptor.cs to DescriptorProtoFile.cs.Jon Skeet2015-08-252-6/+7
| * | Remove Python 2.5 cruftTamir Duberstein2015-08-221-14/+6
| |/
* | Merge pull request #734 from TeBoring/beta-1Feng Xiao2015-08-2519-61/+110
|\ \
| * | Fix bugs on windowsBo Yang2015-08-2532-437/+503
* | | Merge branch 'beta-1' of github.com:google/protobuf into manual-mergeJisi Liu2015-08-252-2/+11
|\ \ \
| * | | Make the PARSER @Deprecated public.Feng Xiao2015-08-252-2/+11
| |/ /
* | | Update descriptor protos.Jisi Liu2015-08-2513-376/+393
* | | Merge branch 'beta-1' of github.com:google/protobuf into manual-mergeJisi Liu2015-08-25171-2737/+6924
|\| |
| * | Cherry-pick Java utf8 change.Feng Xiao2015-08-243-8/+5
| * | Down-integrate from internal code base.Feng Xiao2015-08-2311-112/+418
| * | Down-integrate from google3.Feng Xiao2015-08-22168-2618/+6502
* | | Merge branch 'gcc-c++11-fix' of https://github.com/nsuke/protobuf into beta-1Jisi Liu2015-08-252-9/+4
|\ \ \ | |/ / |/| |
| * | Fix gcc C++11 buildNobuaki Sukegawa2015-08-012-9/+4
* | | Merge branch 'master' of github.com:google/protobufJisi Liu2015-08-21100-2549/+2495
|\ \ \ | | |/ | |/|
| * | Merge pull request #720 from jtattermusch/csharp_fixesJon Skeet2015-08-141-1/+1
| |\ \
| | * | fix type initialization problem with FileDescriptorJan Tattermusch2015-08-141-1/+1
| * | | Merge pull request #571 from thomasvl/validation_supportPaul Yang2015-08-145-90/+287
| |\ \ \ | | |/ / | |/| |
| | * | Add support for a file listing expected package to objc prefixes for validation.Thomas Van Lenten2015-08-145-90/+287
| * | | Allow public access to descriptor.proto as a dependency.Jon Skeet2015-08-132-2/+12
| |/ /
| * | Merge pull request #700 from jskeet/remove-packed-hackJan Tattermusch2015-08-082-12/+1
| |\ \
| | * | Remove our own version of MakeTag now that the main one is fixed.Jon Skeet2015-08-072-12/+1
| * | | Merge pull request #694 from jskeet/groupsJon Skeet2015-08-081-4/+1
| |\ \ \ | | |/ / | |/| |
| | * | Skip groups properly.Jon Skeet2015-08-061-4/+1
| * | | Merge pull request #645 from zsurocking/masterPaul Yang2015-08-0615-81/+202
| |\ \ \
| | * \ \ Merge remote-tracking branch 'upstream/master'Xiao Hang2015-08-0488-2378/+2035
| | |\ \ \
| | * | | | Generate a package name suffix ".nano" for nano messagesXiao Hang2015-07-295-58/+174
| * | | | | Remove unused .pb.h #includes.Bo Yang2015-08-064-4/+0
| | |_|/ / | |/| | |
| * | | | Change ReadTag and PeekTag to just use 0 as a return value for "end of stream...Jon Skeet2015-08-051-3/+1
| * | | | Consume unknown fields when parsing.Jon Skeet2015-08-051-1/+2
| | |/ / | |/| |
| * | | Merge pull request #653 from airtimemedia/masterFeng Xiao2015-08-036-13/+7
| |\ \ \ | | |_|/ | |/| |
| | * | Move pthread include.Tom Hughes2015-07-302-2/+4
| | * | Remove unused private fields.Tom Hughes2015-07-294-12/+2
| | * | Fix compilation error when using C++11.Tom Hughes2015-07-291-1/+1
| | * | Include pthread.h when using GOOGLE_PROTOBUF_NO_THREADLOCAL.Tom Hughes2015-07-281-0/+2
| | |/
| * | Merge pull request #643 from yukawa/fix_win_unicode_buildPaul Yang2015-07-311-1/+1
| |\ \
| | * | Fix build failure on Windows when Unicode build is enabled.Yohei Yukawa2015-07-301-1/+1
| * | | Handle field names of "descriptor" and "types".Jon Skeet2015-07-311-1/+7
| * | | refactor umbrella class helpersJan Tattermusch2015-07-306-34/+28
| * | | Merge pull request #632 from google/csharp-experimentalJan Tattermusch2015-07-3074-2307/+1966
| |\ \ \
| | * | | Prohibit null values for string/bytes fields in generated code.Jon Skeet2015-07-302-13/+2
| | * | | More freezing tidy-up; generated code in next commit.Jon Skeet2015-07-301-3/+1