aboutsummaryrefslogtreecommitdiff
path: root/src/google/protobuf/struct.proto
Commit message (Expand)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
|\
| * Generate the well-known types in C#Jon Skeet2015-07-141-1/+1
| * More cleanup, based around searches for "Google.ProtocolBuffers"Jon Skeet2015-06-261-1/+1
* | Down-integrate from internal branch.Jisi Liu2015-08-211-12/+16
|/
* 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
* | 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