Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fix merging with message-valued oneof | Jon Skeet | 2017-10-31 | 1 | -1/+13 |
| | | | | | | | | | | 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 | -0/+1 |
| | |||||
* | csharp: add support for the json_name option | alien | 2016-03-18 | 1 | -0/+18 |
| | | | | | Conflicts: csharp/src/Google.Protobuf/JsonFormatter.cs | ||||
* | Fix build warnings around unused variables | Jon Skeet | 2015-08-04 | 1 | -2/+1 |
| | |||||
* | Handle field names of "descriptor" and "types". | Jon Skeet | 2015-07-31 | 1 | -0/+8 |
| | |||||
* | First pass at the big rename from ProtocolBuffers to Google.Protobuf. | Jon Skeet | 2015-07-17 | 1 | -0/+56 |
We'll see what I've missed when CI fails... |