summaryrefslogtreecommitdiff
path: root/python/google/protobuf/descriptor.py
AgeCommit message (Expand)Author
2015-10-05Down-integrate from google internal.Jisi Liu
2015-08-22Fix metaclass issue on Python 3. Get text handling tests passing on Python 3.Dan O'Reilly
2015-08-12Merge remote-tracking branch 'upstream/master' into py2_py3_straddleDan O'Reilly
2015-05-21down-integrate internal changesBo Yang
2015-02-25Down integrate from Google internal.Jisi Liu
2015-01-13Prepare for Python2-Python3 straddle.Tres Seaver
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
2010-11-02Submit recent changes from internal branch. See CHANGES.txt for more details.liujisi@google.com
2009-12-18Massive roll-up of changes. See CHANGES.txt.kenton@google.com
2008-09-24Integrate changes from internal Google-internal branch.kenton@google.com
2008-07-10Initial checkin.temporal