aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/google/protobuf/map_type_handler.h
Commit message (Expand)AuthorAge
* Merge pull request #3535 from drivehappy/clang_warn_cleanupGravatar Jisi Liu2017-08-21
|\
| * Fixing unused parameter warnings under Clang.Gravatar drivehappy2017-08-21
* | Merge master into 3.4.xGravatar Jisi Liu2017-07-18
|\|
* | Merge from Google internal for 3.4 releaseGravatar Jisi Liu2017-07-18
| * Fix more implicit type conversions in public headers and generated code.Gravatar Bo Yang2017-06-24
| * Enusre public header and generated code have no implicit converion.Gravatar Bo Yang2017-06-23
|/
* Down-integrate from google3.Gravatar Feng Xiao2017-03-29
* Integrated internal changes from GoogleGravatar Adam Cozzette2016-11-17
* Integrate internal changesGravatar Bo Yang2016-10-10
* Integrate from internal code base.Gravatar Feng Xiao2016-07-13
* Integrated internal changes from GoogleGravatar Adam Cozzette2016-06-29
* Rename 'BYTE_SIZE' macro to 'GOOGLE_PROTOBUF_BYTE_SIZE'Gravatar kbinani2015-09-04
* 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
* Down-integrate from internal code base (C++ maps support).Gravatar Feng Xiao2014-11-14