aboutsummaryrefslogtreecommitdiff
path: root/src/google/protobuf/type.proto
Commit message (Expand)AuthorAgeFilesLines
* Merge 3.2.x branch into master (#2648)Paul Yang2017-01-311-2/+8
* Integrated internal changes from GoogleAdam Cozzette2016-11-171-0/+1
* Integrate internal changesBo Yang2016-10-101-1/+1
* Down-integrate from internal code base.Feng Xiao2015-12-111-28/+32
* 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-62/+40
|/
* 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/+196