aboutsummaryrefslogtreecommitdiff
path: root/src/google/protobuf/any.proto
Commit message (Expand)AuthorAgeFilesLines
* Down-integrate from google3.Josh Haberman2018-09-041-1/+2
* Integrated internal changes from GoogleAdam Cozzette2017-12-011-8/+13
* Merge from Google internal for 3.4 releaseJisi Liu2017-07-181-0/+10
* Integrate internal changesBo Yang2016-10-101-1/+0
* Integrated internal changes from GoogleAdam Cozzette2016-06-291-3/+13
* Down integrate from Google internal.Jisi Liu2016-04-281-0/+2
* Integrate google internal changes.Jisi Liu2016-03-301-4/+33
* Down-integrate from internal code base.Feng Xiao2015-12-111-8/+9
* 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-8/+2
|/
* Merge branch 'master' of github.com:google/protobuf into integrate_from_masterJan Tattermusch2015-05-131-4/+10
|\
| * 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-4/+8
* | 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/+98