aboutsummaryrefslogtreecommitdiff
path: root/java/core
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of github.com:google/protobufJisi Liu2016-04-281-0/+2
|\
| * Added serialVersionUID to ExtendableMessage.Jakub Kukul2016-04-221-0/+2
* | Down integrate from Google internal.Jisi Liu2016-04-2858-2081/+5886
|/
* Integrate google internal changes.Jisi Liu2016-03-3061-1778/+5280
* Remove redundant `the` in comments.Dongjoon Hyun2016-02-032-2/+2
* Restore the license for Internal.javaJisi Liu2016-01-291-1/+29
* Uncomment the test, which was commented out during integrationJisi Liu2016-01-291-185/+184
* Integrate from google internal.Jisi Liu2016-01-29139-0/+55893
* Undo the Java module change for integration.Jisi Liu2016-01-28140-55972/+0
* move test file (was in wrong place after rebasing on java module refactor)Joshua Humphries2016-01-151-0/+211
* throw IOException instead of InvalidProtocolBufferException when appropriateJoshua Humphries2016-01-153-4/+80
* Restructuring protobuf to multiple modulesnmittler2016-01-13142-0/+55866