aboutsummaryrefslogtreecommitdiff
path: root/python/google/protobuf/descriptor.py
Commit message (Expand)AuthorAgeFilesLines
* Integrated internal changes from GoogleAdam Cozzette2018-03-131-29/+80
* Integrated internal changes from GoogleAdam Cozzette2017-12-011-2/+2
* Merge from Google internal for 3.4 releaseJisi Liu2017-07-181-2/+7
* Integrate internal changesBo Yang2016-10-101-11/+38
* Fix spelling in strings and commentsOtto Kekäläinen2016-07-031-3/+3
* Integrated internal changes from GoogleAdam Cozzette2016-06-291-10/+32
* Down integrate from Google internal.Jisi Liu2016-04-281-2/+7
* Down-integrate from internal code base.Feng Xiao2015-12-111-2/+10
* Down-integrate from google internal.Jisi Liu2015-10-051-3/+40
* Fix metaclass issue on Python 3. Get text handling tests passing on Python 3.Dan O'Reilly2015-08-221-2/+3
* Merge remote-tracking branch 'upstream/master' into py2_py3_straddleDan O'Reilly2015-08-121-42/+114
|\
| * down-integrate internal changesBo Yang2015-05-211-31/+15
| * Down integrate from Google internal.Jisi Liu2015-02-251-35/+123
* | Prepare for Python2-Python3 straddle.Tres Seaver2015-01-131-3/+1
|/
* Down-integrate from internal code base.Feng Xiao2014-11-101-2/+3
* Replace links to code.google.com/protobuf with developers.google.com/protocol...Feng Xiao2014-10-011-1/+1
* down integrate python opensource to svnjieluo@google.com2014-08-121-21/+157
* Down-integrate from internal branchxiaofeng@google.com2012-09-221-5/+120
* Submit recent changes from internal branch. See CHANGES.txt for more details.liujisi@google.com2010-11-021-10/+18
* Massive roll-up of changes. See CHANGES.txt.kenton@google.com2009-12-181-27/+184
* Integrate changes from internal Google-internal branch.kenton@google.com2008-09-241-10/+24
* Initial checkin.temporal2008-07-101-0/+419