Commit History

Autor SHA1 Mensaxe Data
  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=10) %!d(string=hai) anos
  Jon Skeet 99a81d297c Fix build warnings around unused variables %!s(int64=10) %!d(string=hai) anos
  Jon Skeet f994cfe808 Handle field names of "descriptor" and "types". %!s(int64=10) %!d(string=hai) anos
  Jon Skeet 59eeebee87 First pass at the big rename from ProtocolBuffers to Google.Protobuf. %!s(int64=10) %!d(string=hai) anos