aboutsummaryrefslogtreecommitdiff
path: root/python/google/protobuf/pyext/map_container.cc
Commit message (Expand)AuthorAgeFilesLines
* Down-integrate proto2 namespace fix.Feng Xiao2018-08-131-5/+5
* Fix failing tests.Feng Xiao2018-08-091-7/+7
* Down-integrate from google3.Feng Xiao2018-08-081-34/+114
* Integrated internal changes from GoogleAdam Cozzette2018-03-131-5/+24
* Integrated internal changes from GoogleAdam Cozzette2017-09-141-8/+11
* Merge from Google internal for 3.4 releaseJisi Liu2017-07-181-1/+23
* Integrated internal changes from GoogleAdam Cozzette2016-11-171-1/+1
* Integrate internal changesBo Yang2016-10-101-17/+78
* Integrate from internal code base.Feng Xiao2016-07-131-1/+2
* Integrated internal changes from GoogleAdam Cozzette2016-06-291-1/+0
* Down integrate from Google internal.Jisi Liu2016-04-281-6/+11
* Fixed Python 3.x C++ build, and updated conformance failure lists.Josh Haberman2016-01-151-1/+1
* Fixed compile for Python 3. There are still some crashes though.Josh Haberman2015-12-301-88/+141
* Down-integrate from internal code base.Feng Xiao2015-12-111-0/+912