aboutsummaryrefslogtreecommitdiff
path: root/src/google/protobuf/util/internal/proto_writer.h
Commit message (Expand)AuthorAgeFilesLines
* Down-integrate from google3.Josh Haberman2018-09-041-5/+17
* Down-integrate from google3.Feng Xiao2018-08-081-12/+24
* Add "override" for overridden virtual functionsKhuzema Pithewan2018-06-191-5/+5
* Merge branch 'master' into down-integrateAdam Cozzette2018-03-131-1/+1
|\
| * The JsonParseOptions::ignore_unknown_fields option behavior treatsAlexey Malov2018-02-121-1/+1
* | Integrated internal changes from GoogleAdam Cozzette2018-03-131-22/+22
|/
* Down-integrate from google3.Feng Xiao2017-03-291-14/+14
* Integrate internal changesBo Yang2016-10-101-0/+8
* Integrate from internal code base.Feng Xiao2016-07-131-3/+6
* Fix spelling in strings and commentsOtto Kekäläinen2016-07-031-1/+1
* Merge pull request #1704 from lizan/json_parse_optionsFeng Xiao2016-07-011-1/+9
|\
| * Add JsonParseOptions to ignore unknown fieldsLizan Zhou2016-06-281-1/+9
* | Integrated internal changes from GoogleAdam Cozzette2016-06-291-0/+4
|/
* Integrate google internal changes.Jisi Liu2016-03-301-3/+18
* Down-integrate from internal code base.Feng Xiao2015-12-111-0/+315