aboutsummaryrefslogtreecommitdiff
path: root/java/util
Commit message (Expand)AuthorAgeFilesLines
...
* 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
* Update version numbers for other languagesJisi Liu2016-05-101-1/+1
* 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-132-142/+47
* Update version number and fix javadoc errors.Feng Xiao2016-01-061-2/+2
* Fix Java travis tests.Feng Xiao2015-12-211-3/+3
* Make conformance tests build for C++ and Java.Feng Xiao2015-12-161-0/+8
* Remove internal options from proto files.Feng Xiao2015-12-141-4/+4
* Down-integrate from internal code base.Feng Xiao2015-12-117-193/+649
* Update version number.Feng Xiao2015-08-261-3/+3
* Merge Java util package to github.Feng Xiao2015-08-2510-0/+4736