aboutsummaryrefslogtreecommitdiffhomepage
path: root/python/google/protobuf/pyext/descriptor.cc
Commit message (Expand)AuthorAge
* Merge branch 'master' into down-integrateGravatar Adam Cozzette2018-03-13
|\
* | Integrated internal changes from GoogleGravatar Adam Cozzette2018-03-13
| * Only check filenames when end with .py in _CalledFromGeneratedFile() (#4262)Gravatar Jie Luo2018-02-09
|/
* Merge from Google internal for 3.4 releaseGravatar Jisi Liu2017-07-18
* Down-integrate from google3.Gravatar Feng Xiao2017-03-29
* Integrate internal changesGravatar Bo Yang2016-10-10
* Integrated internal changes from GoogleGravatar Adam Cozzette2016-06-29
* Down integrate from Google internal.Gravatar Jisi Liu2016-04-28
* Integrate google internal changes.Gravatar Jisi Liu2016-03-30
* Down-integrate from internal code base.Gravatar Feng Xiao2015-12-11
* Removed all warnings from the Python/C++ build.Gravatar Josh Haberman2015-10-28
* Down-integrate from google internal.Gravatar Jisi Liu2015-10-05
* Down-integrate from internal code base.Gravatar Feng Xiao2015-08-23
* Down-integrate from google3.Gravatar Feng Xiao2015-08-22
* down-integrate internal changesGravatar Bo Yang2015-05-21
* Down integrate from Google internal branch for C++ and Java.Gravatar Jisi Liu2015-02-28
* Fixes for Python/C++ implementation in open-source:Gravatar Josh Haberman2015-02-25
* Down integrate from Google internal.Gravatar Jisi Liu2015-02-25
* Fix Python C++ implementation build issues:Gravatar Feng Xiao2014-11-25
* Down-integrate from internal code base.Gravatar Feng Xiao2014-11-10
* Replace links to code.google.com/protobuf with developers.google.com/protocol...Gravatar Feng Xiao2014-10-01
* down integrate python opensource to svnGravatar jieluo@google.com2014-08-12