Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Down-integrate from google3. | Feng Xiao | 2018-08-08 | 1 | -32/+36 |
* | Merge branch 'master' into down-integrate | Adam Cozzette | 2018-03-13 | 1 | -3/+5 |
|\ | |||||
| * | The JsonParseOptions::ignore_unknown_fields option behavior treats | Alexey Malov | 2018-02-12 | 1 | -3/+5 |
* | | Integrated internal changes from Google | Adam Cozzette | 2018-03-13 | 1 | -31/+31 |
|/ | |||||
* | Integrated internal changes from Google | Adam Cozzette | 2016-11-17 | 1 | -1/+1 |
* | Integrate internal changes | Bo Yang | 2016-10-10 | 1 | -3/+6 |
* | Integrate from internal code base. | Feng Xiao | 2016-07-13 | 1 | -7/+27 |
* | Fix data member declaration order. | Feng Xiao | 2016-07-06 | 1 | -2/+2 |
* | Merge pull request #1704 from lizan/json_parse_options | Feng Xiao | 2016-07-01 | 1 | -1/+5 |
|\ | |||||
| * | Add JsonParseOptions to ignore unknown fields | Lizan Zhou | 2016-06-28 | 1 | -1/+5 |
* | | Integrated internal changes from Google | Adam Cozzette | 2016-06-29 | 1 | -10/+20 |
|/ | |||||
* | Integrate google internal changes. | Jisi Liu | 2016-03-30 | 1 | -53/+71 |
* | Down-integrate from internal code base. | Feng Xiao | 2015-12-11 | 1 | -0/+744 |