aboutsummaryrefslogtreecommitdiff
path: root/python/google/protobuf/pyext/descriptor.cc
Commit message (Expand)AuthorAgeFilesLines
* Down-integrate from google3.Feng Xiao2018-08-081-17/+34
* Add Python 3.7 compatibility (#4862)Ben Webb2018-07-121-1/+1
* Merge branch 'master' into down-integrateAdam Cozzette2018-03-131-4/+9
|\
| * Only check filenames when end with .py in _CalledFromGeneratedFile() (#4262)Jie Luo2018-02-091-4/+9
* | Integrated internal changes from GoogleAdam Cozzette2018-03-131-21/+59
|/
* Merge from Google internal for 3.4 releaseJisi Liu2017-07-181-0/+10
* Down-integrate from google3.Feng Xiao2017-03-291-0/+19
* Integrate internal changesBo Yang2016-10-101-6/+16
* Integrated internal changes from GoogleAdam Cozzette2016-06-291-8/+269
* Down integrate from Google internal.Jisi Liu2016-04-281-5/+6
* Integrate google internal changes.Jisi Liu2016-03-301-5/+5
* Down-integrate from internal code base.Feng Xiao2015-12-111-3/+26
* Removed all warnings from the Python/C++ build.Josh Haberman2015-10-281-3/+4
* Down-integrate from google internal.Jisi Liu2015-10-051-3/+38
* Down-integrate from internal code base.Feng Xiao2015-08-231-9/+57
* Down-integrate from google3.Feng Xiao2015-08-221-1/+1
* down-integrate internal changesBo Yang2015-05-211-141/+146
* Down integrate from Google internal branch for C++ and Java.Jisi Liu2015-02-281-6/+9
* Fixes for Python/C++ implementation in open-source:Josh Haberman2015-02-251-0/+15
* Down integrate from Google internal.Jisi Liu2015-02-251-275/+1219
* Fix Python C++ implementation build issues:Feng Xiao2014-11-251-4/+8
* Down-integrate from internal code base.Feng Xiao2014-11-101-37/+185
* 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-0/+357