aboutsummaryrefslogtreecommitdiff
path: root/src/google
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'beta-1' of github.com:google/protobuf into manual-mergeJisi Liu2015-08-25170-2727/+6893
|\
| * Cherry-pick Java utf8 change.Feng Xiao2015-08-243-8/+5
| * Down-integrate from internal code base.Feng Xiao2015-08-2310-102/+387
| * 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-2199-2545/+2490
|\ \
| * \ 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-0487-2374/+2030
| | |\ \ \
| | * | | | 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-3073-2303/+1961
| |\ \ \
| | * | | 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
| | * | | remove the freeze APIJan Tattermusch2015-07-298-46/+2
| | * | | Fix attribute mistake and regenerate code.Jon Skeet2015-07-221-2/+0
| | * | | Remove the usage of attributes for field/method discovery.Jon Skeet2015-07-2212-50/+96
| | * | | Revamp to reflection.Jon Skeet2015-07-2113-99/+45
| | * | | Merge pull request #629 from google/masterJon Skeet2015-07-2114-1420/+1688
| | |\| |
| | * | | Merge pull request #611 from jskeet/csharp-wrappersJon Skeet2015-07-179-34/+463
| | |\ \ \
| | | * | | Fixes from PR review.Jon Skeet2015-07-171-1/+0
| | | * | | First pass at wrapper types.Jon Skeet2015-07-166-70/+93
| | | * | | First part of implementing wrapper types. Not ready yet!Jon Skeet2015-07-166-16/+423
| | * | | | Merge pull request #586 from jtattermusch/csharp_names_exportJan Tattermusch2015-07-165-5/+82
| | |\ \ \ \ | | | |/ / / | | |/| | |
| | | * | | export c# naming routines publiclyJan Tattermusch2015-07-105-5/+82
| | * | | | Merge remote-tracking branch 'upstream/master' into csharp-experimentalJan Tattermusch2015-07-1522-262/+287
| | |\ \ \ \
| | * | | | | Address requested change from code review.Jon Skeet2015-07-151-12/+12
| | * | | | | Don't create nested types (or field accessors) for map types.Jon Skeet2015-07-153-2/+33
| | * | | | | Generate the well-known types in C#Jon Skeet2015-07-1411-7/+11
| | * | | | | Changing reflection namespace (part 3)Jon Skeet2015-07-148-19/+18