aboutsummaryrefslogtreecommitdiff
path: root/java/util/src
Commit message (Expand)AuthorAgeFilesLines
* Integrated internal changes from GoogleAdam Cozzette2016-11-176-25/+80
* Integrate internal changesBo Yang2016-10-106-159/+363
* Allow the JsonFormat.Parser to ignore unknown fieldsDave Protasowski2016-09-082-6/+38
* Integrate from internal code base.Feng Xiao2016-07-132-17/+45
* added minified JSON formatting functionality with testchezRong2016-07-012-26/+159
* Integrated internal changes from GoogleAdam Cozzette2016-06-2910-1149/+1602
* Down integrate from Google internal.Jisi Liu2016-04-284-9/+71
* Merge branch 'master' of github.com:google/protobufJisi Liu2016-03-301-4/+3
|\
| * Allow custom URLs for Any in JsonFormatPradeep Gollakota2016-03-181-4/+3
* | Integrate google internal changes.Jisi Liu2016-03-305-202/+294
|/
* Restructuring protobuf to multiple modulesnmittler2016-01-131-0/+0
* Update version number and fix javadoc errors.Feng Xiao2016-01-061-2/+2
* Remove internal options from proto files.Feng Xiao2015-12-141-4/+4
* Down-integrate from internal code base.Feng Xiao2015-12-117-193/+649
* Merge Java util package to github.Feng Xiao2015-08-259-0/+4534