aboutsummaryrefslogtreecommitdiff
path: root/src/google/protobuf/field_mask.proto
Commit message (Expand)AuthorAgeFilesLines
* Down-integrate from google3.Feng Xiao2018-08-081-26/+19
* Integrated internal changes from GoogleAdam Cozzette2018-03-131-2/+2
* Merge from google internalJisi Liu2017-10-181-0/+6
* Integrated internal changes from GoogleAdam Cozzette2016-11-171-0/+1
* Integrate internal changesBo Yang2016-10-101-4/+3
* Integrated internal changes from GoogleAdam Cozzette2016-06-291-0/+52
* Down integrate from Google internal.Jisi Liu2016-04-281-1/+1
* Integrate google internal changes.Jisi Liu2016-03-301-0/+26
* Down-integrate from internal code base.Feng Xiao2015-12-111-5/+6
* 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-2/+6
|/
* Merge branch 'master' of github.com:google/protobuf into integrate_from_masterJan Tattermusch2015-05-131-0/+2
|\
| * Alpha 1 drop of Google's Objective C plugin and runtime support for protobufs.Thomas Van Lenten2015-05-061-0/+1
* | 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/+161