aboutsummaryrefslogtreecommitdiff
path: root/src/google/protobuf/util/internal/proto_writer.cc
Commit message (Expand)AuthorAgeFilesLines
* Down-integrate from google3.Josh Haberman2018-09-041-4/+7
* Down-integrate from google3.Feng Xiao2018-08-081-32/+36
* Merge branch 'master' into down-integrateAdam Cozzette2018-03-131-3/+5
|\
| * The JsonParseOptions::ignore_unknown_fields option behavior treatsAlexey Malov2018-02-121-3/+5
* | Integrated internal changes from GoogleAdam Cozzette2018-03-131-31/+31
|/
* Integrated internal changes from GoogleAdam Cozzette2016-11-171-1/+1
* Integrate internal changesBo Yang2016-10-101-3/+6
* Integrate from internal code base.Feng Xiao2016-07-131-7/+27
* Fix data member declaration order.Feng Xiao2016-07-061-2/+2
* Merge pull request #1704 from lizan/json_parse_optionsFeng Xiao2016-07-011-1/+5
|\
| * Add JsonParseOptions to ignore unknown fieldsLizan Zhou2016-06-281-1/+5
* | Integrated internal changes from GoogleAdam Cozzette2016-06-291-10/+20
|/
* Integrate google internal changes.Jisi Liu2016-03-301-53/+71
* Down-integrate from internal code base.Feng Xiao2015-12-111-0/+744