summaryrefslogtreecommitdiff
path: root/python/google/protobuf/descriptor_pool.py
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
2016-04-28Down integrate from Google internal.Jisi Liu
2015-12-11Down-integrate from internal code base.Feng Xiao
2015-08-22Clean up exception syntaxTamir Duberstein
2015-08-22Remove Python 2.5 cruftTamir Duberstein
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
2012-09-22Down-integrate from internal branchxiaofeng@google.com