| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Fix merging with message-valued oneof | Jon Skeet | 2017-10-31 | 1 | -0/+15 |
| | | | | | | | | | | | If messages A and B have the same oneof case, which is a message type, and we merge B into A, those sub-messages should be merged. Fixes #3200. Note that I haven't regenerated all the code, as some of the protos have been changed, breaking generation. | ||||
| * | Code review fixes | alien | 2016-03-29 | 1 | -1/+1 |
| | | |||||
| * | csharp: add support for the json_name option | alien | 2016-03-18 | 1 | -1/+8 |
| | | | | | | Conflicts: csharp/src/Google.Protobuf/JsonFormatter.cs | ||||
| * | Remove a redundant layer of directory hierarchy. | Jon Skeet | 2015-08-03 | 1 | -0/+119 |
 |
index : protobuf | |
| Protocol Buffers - Google's data interchange format |
| aboutsummaryrefslogtreecommitdiff |