Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Down integrate from Google internal. | Jisi Liu | 2016-04-28 | 1 | -1/+10 |
| | |||||
* | Down-integrate from internal code base. | Feng Xiao | 2015-12-11 | 1 | -0/+1 |
| | |||||
* | Use angle bracket for well known type proto header. | Bo Yang | 2015-12-08 | 1 | -3/+3 |
| | |||||
* | Update descriptor protos. | Jisi Liu | 2015-08-25 | 1 | -9/+9 |
| | | | | Change-Id: I74a73d3135ec1e0e4d52d741a77456b8e55f038f | ||||
* | Merge branch 'master' of github.com:google/protobuf | Jisi Liu | 2015-08-21 | 1 | -3/+3 |
|\ | | | | | | | Change-Id: If3fb07754a734bae610d95124528e073515ac525 | ||||
| * | Merge remote-tracking branch 'upstream/master' | Xiao Hang | 2015-08-04 | 1 | -2/+3 |
| |\ | |||||
| | * | Changing reflection namespace (part 3) | Jon Skeet | 2015-07-14 | 1 | -2/+2 |
| |/ | | | | | | | | | | | | | | | 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 from internal branch. | Jisi Liu | 2015-08-21 | 1 | -2/+3 |
|/ | | | | Change-Id: Ieb7a2c2fbf35bc2a8fa65b915a5ecb68c83863e4 | ||||
* | down-integrate internal changes | Bo Yang | 2015-05-21 | 1 | -6/+6 |
| | |||||
* | Post csharp landing fixup. | Thomas Van Lenten | 2015-05-18 | 1 | -2/+2 |
| | | | | | 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. | Feng Xiao | 2015-05-11 | 1 | -0/+394 |
Change-Id: I23dee1c1d27b6440658680e9c273b6250213123c |