aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* 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 #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
| * | Fix compilation error when using C++11.Tom Hughes2015-07-291-1/+1
| * | Set cmake include directories on library targets.Tom Hughes2015-07-282-0/+2
| * | Include pthread.h when using GOOGLE_PROTOBUF_NO_THREADLOCAL.Tom Hughes2015-07-281-0/+2
| |/
* | Merge pull request #681 from jskeet/json-fieldmaskJon Skeet2015-08-032-1/+39
|\ \
| * | JSON formatting for FieldMaskJon Skeet2015-08-032-1/+39
* | | Merge pull request #677 from jskeet/move-protosJon Skeet2015-08-033-121/+121
|\ \ \
| * | | Remove a redundant layer of directory hierarchy.Jon Skeet2015-08-033-121/+121
* | | | Merge pull request #680 from jskeet/aptcaJon Skeet2015-08-031-0/+2
|\ \ \ \ | |_|/ / |/| | |
| * | | Allow partially-trusted callers again.Jon Skeet2015-08-031-0/+2
| |/ /
* | | Merge pull request #678 from jskeet/stream-ctorJon Skeet2015-08-0311-127/+100
|\ \ \ | |/ / |/| |
| * | Expose Coded*Stream constructors directly.Jon Skeet2015-08-0311-127/+100
|/ /
* | Merge pull request #675 from jtattermusch/signingJon Skeet2015-08-0314-92/+87
|\ \