aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* 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
| |\ \ \ \
| | * \ \ \ Merge branch 'master' of https://github.com/zsurocking/protobufXiao Hang2015-07-290-0/+0
| | |\ \ \ \
| * | \ \ \ \ Merge branch 'master' of https://github.com/zsurocking/protobufXiao Hang2015-08-0420-28/+28
| |\ \ \ \ \ \ | | |/ / / / / | |/| / / / / | | |/ / / /
| | * | | / Generate a package name suffix ".nano" for nano messagesXiao Hang2015-07-275-58/+174
| | | |_|/ | | |/| |
| * / | | Generate a package name suffix ".nano" for nano messagesXiao Hang2015-07-296-63/+179
| |/ / /
* | | | Merge pull request #696 from TeBoring/tempPaul Yang2015-08-064-4/+0
|\ \ \ \ | |_|_|/ |/| | |
| * | | Remove unused .pb.h #includes.Bo Yang2015-08-064-4/+0
|/ / /
* | | Merge pull request #692 from jskeet/tag-0Jan Tattermusch2015-08-0528-405/+167
|\ \ \
| * | | Make InvalidProtocolBufferException.InvalidTag internal.Jon Skeet2015-08-051-1/+1
| * | | Generated code changes for previous commit.Jon Skeet2015-08-0519-339/+113
| * | | Change ReadTag and PeekTag to just use 0 as a return value for "end of stream...Jon Skeet2015-08-058-65/+53
|/ / /
* | | Merge pull request #689 from jskeet/fix-eofJon Skeet2015-08-0532-10/+2897
|\ \ \
| * | | Update AssemblyInfo for conformance - mostly to fix version numbers.Jon Skeet2015-08-051-23/+35
| * | | Validate that after reading a message, we've consumed as many bytes as we exp...Jon Skeet2015-08-053-30/+47
| * | | Generated code changes for previous commit.Jon Skeet2015-08-0519-0/+113
| * | | Consume unknown fields when parsing.Jon Skeet2015-08-053-1/+64
| * | | Added C# conformance tests.Jon Skeet2015-08-053-1/+41
| * | | First pass at C# conformance tests.Jon Skeet2015-08-058-0/+2642
|/ / /
* | | Merge pull request #691 from jskeet/xml-documentationJon Skeet2015-08-0527-108/+742
|\ \ \
| * | | Fix one cref that Mono was unhappy withJon Skeet2015-08-051-1/+1
| * | | Document everything, and turn on errors if we fail to document anything in th...Jon Skeet2015-08-0426-107/+741
| | |/ | |/|
* | | Merge pull request #684 from jskeet/unusedJan Tattermusch2015-08-043-3/+3
|\ \ \ | |/ / |/| |
| * | Fix build warnings around unused variablesJon Skeet2015-08-043-3/+3
|/ /
* | Merge pull request #653 from airtimemedia/masterFeng Xiao2015-08-038-13/+9
|\ \
| * | Move pthread include.Tom Hughes2015-07-302-2/+4
| * | Remove unused private fields.Tom Hughes2015-07-294-12/+2