protobuf - Protocol Buffers – Google’s data interchange format

	Commit message (Collapse)	Author	Age
*	Remove non-C# options from C#-only test protos	Jon Skeet	2017-11-14
\|
*	Fix merging with message-valued oneof	Jon Skeet	2017-10-31
\| \| \| \| \| \| \| \| \| \|	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
\|
*	csharp: add support for the json_name option	alien	2016-03-18
\| \| \| \| \|	Conflicts: csharp/src/Google.Protobuf/JsonFormatter.cs
*	Remove a redundant layer of directory hierarchy.	Jon Skeet	2015-08-03