aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Down-integrate from google3.Feng Xiao2015-08-22226-3661/+8484
* Merge branch 'master' of github.com:google/protobufJisi Liu2015-08-21477-257657/+40241
|\
| * Merge pull request #584 from haberman/cwarningsJoshua Haberman2015-08-217-249/+354
| |\
| | * Return TypedData_Wrap_Struct directly.Josh Haberman2015-08-202-4/+2
| | * Conform to C89/C90 variable declaration rules.Josh Haberman2015-07-107-247/+354
| * | Merge pull request #720 from jtattermusch/csharp_fixesJon Skeet2015-08-144-150/+183
| |\ \
| | * | fix type initialization problem with FileDescriptorJan Tattermusch2015-08-142-149/+176
| | * | add a failing descriptor testJan Tattermusch2015-08-141-0/+7
| | * | remove duplicate test caseJan Tattermusch2015-08-141-1/+0
| * | | Merge pull request #571 from thomasvl/validation_supportPaul Yang2015-08-146-94/+288
| |\ \ \ | | |/ / | |/| |
| | * | Add support for a file listing expected package to objc prefixes for validation.Thomas Van Lenten2015-08-146-94/+288
| * | | Merge pull request #716 from haberman/fixrubyJoshua Haberman2015-08-133-123/+141
| |\ \ \
| | * | | Fixed several Ruby conformance test cases through upb update.Josh Haberman2015-08-123-123/+141
| * | | | Merge pull request #718 from jskeet/descriptor-descriptorJan Tattermusch2015-08-133-2/+27
| |\ \ \ \
| | * | | | Allow public access to descriptor.proto as a dependency.Jon Skeet2015-08-133-2/+27
| |/ / / /
| * | | | Merge pull request #673 from podsvirov/topic-cmake-installFeng Xiao2015-08-125-0/+302
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Install headers from extract_includes for all platformsKonstantin Podsvirov2015-08-041-1/+1
| | * | | Fix: comment typoKonstantin Podsvirov2015-08-031-1/+1
| | * | | Install well-known type proto files from CMake projectKonstantin Podsvirov2015-08-032-3/+57
| | * | | CMake installation now compatible with origin FindProtobuf moduleKonstantin Podsvirov2015-08-023-2/+156
| | * | | Parsing version from configure.ac for CMake projectKonstantin Podsvirov2015-08-012-15/+24
| | * | | Install protobuf from cmake projectKonstantin Podsvirov2015-07-314-0/+85
| * | | | Merge pull request #702 from jtattermusch/visual_studio_build_static_runtimeFeng Xiao2015-08-121-0/+13
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | only link runtime libraries statically for a static buildJan Tattermusch2015-08-121-12/+13
| | * | | make VS build link runtime staticallyJan Tattermusch2015-08-081-0/+12
| * | | | Merge pull request #706 from thomasvl/revert_any_change_2Paul Yang2015-08-113-121/+1
| |\ \ \ \
| | * | | | Revert "Add packFrom, unpackTo and is in google.protobuf.Any."Thomas Van Lenten2015-08-113-121/+1
| |/ / / /
| * | | | Merge pull request #649 from cijianzy/masterPaul Yang2015-08-111-1/+1
| |\ \ \ \
| | * | | | Update GPBWellKnownTypes.mYue Zhang2015-07-291-1/+1
| * | | | | Merge pull request #703 from jskeet/more-todosJan Tattermusch2015-08-107-126/+168
| |\ \ \ \ \
| | * | | | | More TODOs done.Jon Skeet2015-08-107-126/+168
| |/ / / / /
| * | | | | Merge pull request #701 from jskeet/map-viewsJon Skeet2015-08-102-4/+180
| |\ \ \ \ \
| | * | | | | Fix parameter name in exception.Jon Skeet2015-08-101-1/+1
| | * | | | | Implement ICollection.CopyTo (using Array) for MapField views.Jon Skeet2015-08-102-1/+26
| | * | | | | Implement Keys and Values as viewsJon Skeet2015-08-082-4/+155
| | | |/ / / | | |/| | |
| * | | | | Merge pull request #699 from jskeet/validate_packedJon Skeet2015-08-103-4/+18
| |\ \ \ \ \
| | * | | | | Make FieldDescriptor.IsPacked work appropriately.Jon Skeet2015-08-083-4/+18
| | |/ / / /
| * | | | | 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 #695 from jskeet/remove-todosJon Skeet2015-08-0817-103/+83
| |\ \ \ \ \
| | * | | | | Address review comments.Jon Skeet2015-08-081-2/+0
| | * | | | | Remove reference to generic types within XML comment.Jon Skeet2015-08-081-2/+2
| | * | | | | Tidying up - fix a bunch of TODOs and remove outdated ones.Jon Skeet2015-08-0817-102/+84
| |/ / / / /
| * | | | | Merge pull request #694 from jskeet/groupsJon Skeet2015-08-0829-488/+303
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | Address review comments.Jon Skeet2015-08-082-2/+24
| | * | | | Generated code for previous commit.Jon Skeet2015-08-0621-452/+142
| | * | | | Skip groups properly.Jon Skeet2015-08-067-36/+139
| * | | | | Merge pull request #645 from zsurocking/masterPaul Yang2015-08-0635-104/+225
| |\ \ \ \ \
| | * \ \ \ \ Merge remote-tracking branch 'upstream/master'Xiao Hang2015-08-04411-255904/+34404
| | |\ \ \ \ \
| | * \ \ \ \ \ Merge branch 'master' of https://github.com/zsurocking/protobufXiao Hang2015-08-040-0/+0
| | |\ \ \ \ \ \