aboutsummaryrefslogtreecommitdiff
path: root/src/google/protobuf/util/internal/testdata
Commit message (Expand)AuthorAgeFilesLines
* Replace repo links.Feng Xiao2018-08-221-1/+1
* Down-integrate from google3.Feng Xiao2018-08-081-0/+2
* Merge pull request #4813 from htuch/fix-any-in-mapFeng Xiao2018-06-211-0/+3
|\
| * protostream_objectwriter: fix bug when Any is directly embedded in a map.Harvey Tuch2018-06-211-0/+3
* | protostream_objectsource: preserve print options across Any.Harvey Tuch2018-06-211-0/+3
|/
* Integrated internal changes from GoogleAdam Cozzette2018-03-131-0/+1
* Use per-type table to lookup JSON name.Feng Xiao2017-03-091-0/+9
* Integrate internal changesBo Yang2016-10-107-40/+316
* Down integrate from Google internal.Jisi Liu2016-04-281-0/+9
* Integrate google internal changes.Jisi Liu2016-03-301-0/+7
* Integrate from google internal.Jisi Liu2016-01-291-0/+29
* Down-integrate from internal code base.Feng Xiao2015-12-113-4/+12
* Down-integrate from google3.Feng Xiao2015-08-221-0/+7
* Down-integrate from internal branch.Jisi Liu2015-08-211-0/+68
* Down-integrate from internal code base.Feng Xiao2015-06-159-0/+752