aboutsummaryrefslogtreecommitdiff
path: root/src/google/protobuf/map_field_lite.h
Commit message (Expand)AuthorAgeFilesLines
* Integrated internal changes from GoogleAdam Cozzette2017-09-141-0/+15
* Merge master into 3.4.xJisi Liu2017-07-181-1/+1
|\
| * Enusre public header and generated code have no implicit converion.Bo Yang2017-06-231-1/+1
* | Merge from Google internal for 3.4 releaseJisi Liu2017-07-181-1/+4
|/
* Down-integrate from google3.Feng Xiao2017-03-291-190/+36
* Integrated internal changes from GoogleAdam Cozzette2016-11-171-3/+4
* Fix spelling in strings and commentsOtto Kekäläinen2016-07-031-1/+1
* Fix bugs on windows.Bo Yang2015-05-241-1/+1
* down-integrate internal changesBo Yang2015-05-211-1/+1
* Down integrate from Google internal branch for C++ and Java.Jisi Liu2015-02-281-0/+278