Commit message (Collapse) | Author | Age | |
---|---|---|---|
* | Integrated internal changes from Google | 2016-06-29 | |
| | | | | This includes all internal changes from around May 20 to now. | ||
* | Update version numbers for other languages | 2016-05-10 | |
| | |||
* | Merge branch 'master' of github.com:google/protobuf | 2016-04-28 | |
|\ | |||
* | | Down integrate from Google internal. | 2016-04-28 | |
| | | |||
| * | Added serialVersionUID to ExtendableMessage. | 2016-04-22 | |
|/ | |||
* | Integrate google internal changes. | 2016-03-30 | |
| | |||
* | Remove redundant `the` in comments. | 2016-02-03 | |
| | |||
* | Restore the license for Internal.java | 2016-01-29 | |
| | |||
* | Uncomment the test, which was commented out during integration | 2016-01-29 | |
| | |||
* | Integrate from google internal. | 2016-01-29 | |
| | | | | | Java files are moved to un-do the hack in the prevous commit, which moved the java files to the original position for integration. | ||
* | Undo the Java module change for integration. | 2016-01-28 | |
| | | | | | | | | | Moving the files to their original location, so that opensource changes can be picked during the internal merge. Those files will be moved into the correct location after merging with internal code. Note: do NOT merge this into master without the other internal down-integration commit. | ||
* | move test file (was in wrong place after rebasing on java module refactor) | 2016-01-15 | |
| | |||
* | throw IOException instead of InvalidProtocolBufferException when appropriate | 2016-01-15 | |
| | |||
* | Restructuring protobuf to multiple modules | 2016-01-13 | |
protobuf/java will become a parent pom that will contain two modules: core - contains all of the code for the protobuf-java artifact util - contains all of the code for the protobuf-java-util artifact Also cleaned up various Maven warnings. |