summaryrefslogtreecommitdiff
path: root/python/google/protobuf/pyext/descriptor.h
AgeCommit message (Expand)Author
2018-11-04Revert "Merge tag 'v3.0.1-javalite'"android-wear-8.0.0_r2Colin Cross
2016-06-29Integrated internal changes from GoogleAdam Cozzette
2015-10-05Down-integrate from google internal.Jisi Liu
2015-05-21down-integrate internal changesBo Yang
2015-02-25Down integrate from Google internal.Jisi Liu
2014-11-10Down-integrate from internal code base.Feng Xiao
2014-10-01Replace links to code.google.com/protobuf with developers.google.com/protocol...Feng Xiao
2014-08-12down integrate python opensource to svnjieluo@google.com