aboutsummaryrefslogtreecommitdiff
path: root/src/google/protobuf/api.proto
Commit message (Expand)AuthorAgeFilesLines
* Merge from Google internal for 3.4 releaseJisi Liu2017-07-181-21/+29
* Integrated internal changes from GoogleAdam Cozzette2016-11-171-0/+1
* Integrate internal changesBo Yang2016-10-101-1/+0
* Down-integrate from internal code base.Feng Xiao2015-12-111-2/+3
* Merge branch 'master' of github.com:google/protobufJisi Liu2015-08-211-0/+1
|\
| * Generate the well-known types in C#Jon Skeet2015-07-141-0/+1
* | Down-integrate from internal branch.Jisi Liu2015-08-211-6/+101
|/
* 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-0/+104