aboutsummaryrefslogtreecommitdiff
path: root/src/google/protobuf/api.pb.cc
Commit message (Expand)AuthorAgeFilesLines
* Update descriptor protos.Jisi Liu2015-08-251-89/+89
* Merge branch 'master' of github.com:google/protobufJisi Liu2015-08-211-2/+3
|\
| * Merge remote-tracking branch 'upstream/master'Xiao Hang2015-08-041-2/+3
* | Down-integrate from internal branch.Jisi Liu2015-08-211-10/+591
|/
* down-integrate internal changesBo Yang2015-05-211-33/+41
* Include generated code of well-known types in protobuf C++ runtime.Feng Xiao2015-05-111-0/+1392