Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Integrate from internal code base. | Feng Xiao | 2016-07-13 | 4 | -1/+98 |
| | |||||
* | Fix spelling in strings and comments | Otto Kekäläinen | 2016-07-03 | 3 | -21/+21 |
| | |||||
* | Integrated internal changes from Google | Adam Cozzette | 2016-06-29 | 48 | -2035/+5516 |
| | | | | This includes all internal changes from around May 20 to now. | ||||
* | Update version numbers for other languages | Jisi Liu | 2016-05-10 | 1 | -1/+1 |
| | |||||
* | Merge branch 'master' of github.com:google/protobuf | Jisi Liu | 2016-04-28 | 1 | -0/+2 |
|\ | |||||
| * | Added serialVersionUID to ExtendableMessage. | Jakub Kukul | 2016-04-22 | 1 | -0/+2 |
| | | |||||
* | | Down integrate from Google internal. | Jisi Liu | 2016-04-28 | 58 | -2081/+5886 |
|/ | |||||
* | Integrate google internal changes. | Jisi Liu | 2016-03-30 | 61 | -1778/+5280 |
| | |||||
* | Remove redundant `the` in comments. | Dongjoon Hyun | 2016-02-03 | 2 | -2/+2 |
| | |||||
* | Restore the license for Internal.java | Jisi Liu | 2016-01-29 | 1 | -1/+29 |
| | |||||
* | Uncomment the test, which was commented out during integration | Jisi Liu | 2016-01-29 | 1 | -185/+184 |
| | |||||
* | Integrate from google internal. | Jisi Liu | 2016-01-29 | 139 | -0/+55893 |
| | | | | | 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. | Jisi Liu | 2016-01-28 | 140 | -55972/+0 |
| | | | | | | | | | 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) | Joshua Humphries | 2016-01-15 | 1 | -0/+211 |
| | |||||
* | throw IOException instead of InvalidProtocolBufferException when appropriate | Joshua Humphries | 2016-01-15 | 3 | -4/+80 |
| | |||||
* | Restructuring protobuf to multiple modules | nmittler | 2016-01-13 | 142 | -0/+55866 |
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. |