aboutsummaryrefslogtreecommitdiff
path: root/src/google/protobuf/struct.proto
Commit message (Collapse)AuthorAgeFilesLines
* Integrate internal changesBo Yang2016-10-101-1/+1
|
* Integrate google internal changes.Jisi Liu2016-03-301-1/+2
|
* Down-integrate from internal code base.Feng Xiao2015-12-111-4/+5
|
* Merge branch 'master' of github.com:google/protobufJisi Liu2015-08-211-1/+1
|\ | | | | | | Change-Id: If3fb07754a734bae610d95124528e073515ac525
| * Generate the well-known types in C#Jon Skeet2015-07-141-1/+1
| | | | | | | | | | | | | | | | | | | | 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 Skeet2015-06-261-1/+1
| | | | | | | | | | | | | | - 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
* | Down-integrate from internal branch.Jisi Liu2015-08-211-12/+16
|/ | | | Change-Id: Ieb7a2c2fbf35bc2a8fa65b915a5ecb68c83863e4
* Merge branch 'master' of github.com:google/protobuf into integrate_from_masterJan Tattermusch2015-05-131-6/+13
|\
| * Alpha 1 drop of Google's Objective C plugin and runtime support for protobufs.Thomas Van Lenten2015-05-061-0/+1
| |
| * Include all well-known type protos.Feng Xiao2015-04-201-6/+11
| | | | | | | | Change-Id: I122f1cee71a8a739ea603e52582cb0fa9698f0ed
* | Add C# namespace to .proto files (e.g. descriptors, unit tests)Jon Skeet2015-05-061-1/+1
|/
* Add the .proto files for well-known types.Feng Xiao2015-02-091-0/+83