Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Merge remote-tracking branch 'upstream/master' | 2015-08-04 | |
|\ | |||
| * | Changing reflection namespace (part 3) | 2015-07-14 | |
|/ | | | | | | | | Change the C# namespace in descriptor.proto to Google.Protobuf.Reflection. This then means changing where the generated code lives, which means updating the project file... It also involves regenerating the C++ - which has updated the well-known types as well, for no terribly obvious reason... | ||
* | down-integrate internal changes | 2015-05-21 | |
| | |||
* | Post csharp landing fixup. | 2015-05-18 | |
| | | | | | Re-add the objc prefix that got removed by accident. Regenerate the generated descriptors (C++ and ObjC). | ||
* | Include generated code of well-known types in protobuf C++ runtime. | 2015-05-11 | |
Change-Id: I23dee1c1d27b6440658680e9c273b6250213123c |