aboutsummaryrefslogtreecommitdiff
path: root/python/google/protobuf/pyext/python_descriptor.cc
Commit message (Expand)AuthorAgeFilesLines
* down integrate to svnjieluo@google.com2014-07-181-337/+0
* Down-integrate from internal branchxiaofeng@google.com2012-09-221-3/+6
* Submit recent changes from internal branch. See CHANGES.txt for more details.liujisi@google.com2010-11-021-0/+334