aboutsummaryrefslogtreecommitdiff
path: root/python/google/protobuf/internal/descriptor_test.py
Commit message (Expand)AuthorAgeFilesLines
* Down-integrate from google3.Feng Xiao2018-08-081-0/+11
* Fix python descriptor test.Jisi Liu2017-12-141-0/+13
* Integrated internal changes from GoogleAdam Cozzette2017-09-141-62/+237
* Merge from Google internal for 3.4 releaseJisi Liu2017-07-181-0/+6
* Integrate internal changesBo Yang2016-10-101-0/+19
* Integrated internal changes from GoogleAdam Cozzette2016-06-291-20/+21
* Integrate google internal changes.Jisi Liu2016-03-301-2/+3
* Down-integrate from internal code base.Feng Xiao2015-12-111-3/+17
* Revert back changes to import unittest2 for py26Jisi Liu2015-10-051-2/+5
* Down-integrate from google internal.Jisi Liu2015-10-051-7/+28
* Get Python 2.6 working.Dan O'Reilly2015-08-141-3/+7
* Merge remote-tracking branch 'upstream/master' into py2_py3_straddleDan O'Reilly2015-08-121-39/+138
|\
| * down-integrate internal changesBo Yang2015-05-211-1/+1
| * Don't hard-code the python pathTamir Duberstein2015-05-061-1/+1
| * [PYTHON] Drop dependency on 'google.apputils'.Tamir Duberstein2015-04-101-7/+7
| * Down integrate from Google internal.Jisi Liu2015-02-251-38/+138
* | Straddle Python 2.6, 2.7, 3.3, 3.4.Tres Seaver2015-01-131-1/+1
* | Drop dependency on 'google.apputils'.Tres Seaver2015-01-131-5/+6
|/
* Down-integrate from internal code base.Feng Xiao2014-11-101-0/+10
* 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-48/+104
* Down-integrate from internal branchxiaofeng@google.com2012-09-221-0/+279
* Massive roll-up of changes. See CHANGES.txt.kenton@google.com2009-12-181-3/+224
* Integrate changes from internal code.kenton@google.com2008-11-211-0/+2
* Integrate changes from internal Google-internal branch.kenton@google.com2008-09-241-10/+24
* Initial checkin.temporal2008-07-101-0/+97