aboutsummaryrefslogtreecommitdiff
path: root/python/google/protobuf/pyext/descriptor_containers.h
Commit message (Expand)AuthorAgeFilesLines
* Down-integrate from google3.Feng Xiao2018-08-081-1/+1
* Integrated internal changes from GoogleAdam Cozzette2016-06-291-0/+8
* Down-integrate from google internal.Jisi Liu2015-10-051-0/+1
* down-integrate internal changesBo Yang2015-05-211-0/+5
* Down integrate from Google internal.Jisi Liu2015-02-251-0/+95