Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Add "override" for overridden virtual functions | Khuzema Pithewan | 2018-06-19 |
| | | | | | | Add "override" for overridden virtual functions. Please refer following issue for discussion on this. https://github.com/google/protobuf/issues/67 | ||
* | Merge branch 'master' into fixbug_enum2json2 | stone4774 | 2018-03-22 |
|\ | |||
* | | Fix bug: whether always_print_enums_as_ints is true or false, it always ↵ | stone4774 | 2018-03-19 |
| | | | | | | | | print the default value of enums as strings | ||
| * | Integrated internal changes from Google | Adam Cozzette | 2018-03-13 |
|/ | |||
* | Merge from Google internal for 3.4 release | Jisi Liu | 2017-07-18 |
| | |||
* | Down-integrate from google3. | Feng Xiao | 2017-03-29 |
| | |||
* | Add option to preserve original proto field names | Brendan McCarthy | 2017-03-17 |
| | |||
* | Integrated internal changes from Google | Adam Cozzette | 2016-11-17 |
| | |||
* | Integrate from internal code base. | Feng Xiao | 2016-07-13 |
| | |||
* | Integrate google internal changes. | Jisi Liu | 2016-03-30 |
| | |||
* | Down-integrate from internal code base. | Feng Xiao | 2015-12-11 |
| | |||
* | Down-integrate from google internal. | Jisi Liu | 2015-10-05 |
| | |||
* | Fix bugs on windows | Bo Yang | 2015-08-25 |
| | |||
* | Down-integrate from google3. | Feng Xiao | 2015-08-22 |
| | |||
* | Fix broken builds. | Feng Xiao | 2015-06-17 |
| | |||
* | Down-integrate from internal code base. | Feng Xiao | 2015-06-15 |
[ci skip] Change-Id: I9391c09640e0b0b2b21c45a97a1fc91814d95c5d |