Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Integrated internal changes from Google | Adam Cozzette | 2018-03-13 |
| | |||
* | Merge from google internal | Jisi Liu | 2017-10-18 |
| | |||
* | Integrated internal changes from Google | Adam Cozzette | 2016-11-17 |
| | |||
* | Integrate internal changes | Bo Yang | 2016-10-10 |
| | |||
* | Integrated internal changes from Google | Adam Cozzette | 2016-06-29 |
| | | | | This includes all internal changes from around May 20 to now. | ||
* | Down integrate from Google internal. | Jisi Liu | 2016-04-28 |
| | |||
* | Integrate google internal changes. | Jisi Liu | 2016-03-30 |
| | |||
* | Down-integrate from internal code base. | Feng Xiao | 2015-12-11 |
| | |||
* | Merge branch 'master' of github.com:google/protobuf | Jisi Liu | 2015-08-21 |
|\ | | | | | | | Change-Id: If3fb07754a734bae610d95124528e073515ac525 | ||
* | | Down-integrate from internal branch. | Jisi Liu | 2015-08-21 |
| | | | | | | | | Change-Id: Ieb7a2c2fbf35bc2a8fa65b915a5ecb68c83863e4 | ||
| * | Generate the well-known types in C# | Jon Skeet | 2015-07-14 |
| | | | | | | | | | | | | | | | | | | | | This involves: - Specifying a namespace in each proto (including ones we'd previously missed) - Updating the generation script - Changing codegen to implement IReflectedMessage.Fields explicitly (a good thing anyway) - Changing reflection tests to take account of the explicit interface implementation Non-generated code in this commit; generated code to follow | ||
| * | More cleanup, based around searches for "Google.ProtocolBuffers" | Jon Skeet | 2015-06-26 |
|/ | | | | | | | - Remove some old proto2-based C#-only messages - Remove the "build" directory which only contained out-of-date files - Remove the csharp_namespace option from proto2 messages - Change "Google.ProtocolBuffers" to "Google.Protobuf" in other messages | ||
* | Merge branch 'master' of github.com:google/protobuf into integrate_from_master | Jan Tattermusch | 2015-05-13 |
|\ | |||
* | | Add C# namespace to .proto files (e.g. descriptors, unit tests) | Jon Skeet | 2015-05-06 |
| | | |||
| * | Alpha 1 drop of Google's Objective C plugin and runtime support for protobufs. | Thomas Van Lenten | 2015-05-06 |
|/ | |||
* | Add the .proto files for well-known types. | Feng Xiao | 2015-02-09 |