carto/protobuf

Autor	SHA1 Mensaxe	Data
Jon Skeet	91ff83c024 Remove non-C# options from C#-only test protos	%!s(int64=7) %!d(string=hai) anos
Jon Skeet	cbe250591f Fix merging with message-valued oneof	%!s(int64=8) %!d(string=hai) anos
alien	6f8dd2115b Code review fixes	%!s(int64=9) %!d(string=hai) anos
alien	0d32ab37fa csharp: add support for the json_name option	%!s(int64=9) %!d(string=hai) anos
Jon Skeet	0f370b468b Remove a redundant layer of directory hierarchy.	%!s(int64=10) %!d(string=hai) anos