aboutsummaryrefslogtreecommitdiff
path: root/src/google/protobuf/util/internal/protostream_objectsource.cc
Commit message (Expand)AuthorAgeFilesLines
* Integrated internal changes from GoogleAdam Cozzette2018-03-131-34/+35
* Integrated internal changes from GoogleAdam Cozzette2017-12-011-2/+0
* Merge from Google internal for 3.4 releaseJisi Liu2017-07-181-10/+9
* Down-integrate from google3.Feng Xiao2017-03-291-22/+22
* Add option to preserve original proto field namesBrendan McCarthy2017-03-171-1/+7
* Add an option to always print enums as ints in Json APISanchay Harneja2017-02-181-0/+8
* Merge 3.2.x branch into master (#2648)Paul Yang2017-01-311-9/+1
* Merge branch 'master' into down-integrate-with-msvc-fixAdam Cozzette2016-11-171-2/+6
|\
| * Made helper code also consider package name 'proto2' when dealing with Messag...guptasu2016-11-101-2/+6
* | Integrated internal changes from GoogleAdam Cozzette2016-11-171-9/+15
|/
* Integrate internal changesBo Yang2016-10-101-2/+9
* Integrated internal changes from GoogleAdam Cozzette2016-06-291-3/+9
* Down integrate from Google internal.Jisi Liu2016-04-281-2/+22
* Integrate google internal changes.Jisi Liu2016-03-301-6/+49
* Down-integrate from internal code base.Feng Xiao2015-12-111-104/+83
* Correct spellingBenjamin Barenblat2015-10-301-1/+1
* Down-integrate from google internal.Jisi Liu2015-10-051-9/+13
* fix "memory leaks" in protostream-object files.Jisi Liu2015-08-251-22/+30
* Down-integrate from google3.Feng Xiao2015-08-221-7/+10
* Down-integrate from internal code base.Feng Xiao2015-06-151-0/+1051