aboutsummaryrefslogtreecommitdiffhomepage
path: root/java
Commit message (Expand)AuthorAge
* Merge branch '3.6.x' into merge-3-6-xGravatar Adam Cozzette2018-06-25
|\
* \ Merge pull request #2811 from Dunemaster/masterGravatar Feng Xiao2018-06-11
|\ \
| | * Update version number to 3.6.0Gravatar Jisi Liu2018-05-14
* | | Remove unsafe no-copy String allocation since it's not useful in recent Java ...Gravatar Anuraag Agrawal2018-05-11
| |/ |/|
* | Cleanup + documentation for Java Lite runtime.Gravatar Feng Xiao2018-04-12
* | Merge branch (#4466)Gravatar Paul Yang2018-04-02
* | Added map_lite_test.proto to fix LiteTestGravatar Adam Cozzette2018-03-20
* | Integrated internal changes from GoogleGravatar Adam Cozzette2018-03-13
* | Drop java 6 supportGravatar David Ostrovsky2018-01-25
* | fix typo in FieldMaskTree.java commentGravatar kenji yoshida2018-01-22
* | Merge remote-tracking branch 'origin/3.5.x' into masterGravatar Jisi Liu2018-01-03
|\ \
| * | Update version number to 3.5.1Gravatar Jisi Liu2017-12-19
* | | Add deprecation annotation for oneof case.Gravatar Jisi Liu2017-12-13
* | | Merge branch 'master' into down-integrateGravatar Adam Cozzette2017-12-01
|\ \ \
* | | | Integrated internal changes from GoogleGravatar Adam Cozzette2017-12-01
| * | | Merge branch '3.5.x' into 3.5.x-mergeGravatar Adam Cozzette2017-11-30
| |\| |
| * | | Add a UTF-8 decoder that uses Unsafe to directly decode a byte buffer.Gravatar Anuraag Agrawal2017-11-29
|/ / /
| * / Update version number to 3.5.0Gravatar Jisi Liu2017-11-02
|/ /
* | Add missing filesGravatar Jisi Liu2017-10-26
* | Merge remote-tracking branch 'origin/3.4.x' into masterGravatar Jisi Liu2017-10-25
|\ \
| * \ Merge pull request #3578 from pherl/filedeprecationGravatar Jisi Liu2017-10-18
| |\ \
* | | | Merge from google internalGravatar Jisi Liu2017-10-18
* | | | Merge remote-tracking branch 'origin/3.4.x' into masterGravatar Jisi Liu2017-10-11
|\| | |
| * | | Bump version for minor releaseGravatar Jisi Liu2017-09-14
* | | | Integrated internal changes from GoogleGravatar Adam Cozzette2017-09-14
| | * | Add TODOGravatar Jisi Liu2017-08-31
| | * | Add @Deprecated annotation support for proto file.Gravatar Jisi Liu2017-08-31
| |/ /
* | | Merge remote-tracking branch 'origin/3.4.x' into mergemasterGravatar Jisi Liu2017-08-18
|\| |
* | | PROTBUF-3394 Potential SIGBUS with UnsafeUtil.getLongGravatar alanbur2017-08-08
| * | Remove dependency on guava 20Gravatar Jisi Liu2017-07-25
| * | Merge from masterGravatar Jisi Liu2017-07-25
| * | Update version number for 3.4.0Gravatar Jisi Liu2017-07-24
| * | Merge from Google internal for 3.4 releaseGravatar Jisi Liu2017-07-18
* | | Merge 3.3.x into masterGravatar Bo Yang2017-07-18
|\ \ \ | |/ / |/| |
| * | Update version number to 3.3.2Gravatar Bo Yang2017-06-21
| * | Revert guava depedency to version 19.Gravatar Feng Xiao2017-05-12
| * | Update version number to 3.3.1Gravatar Feng Xiao2017-05-08
* | | Merge remote-tracking branch 'remotes/google/3.3.x' into merge-3.3-to-masterGravatar Adam Cozzette2017-04-27
|\| |
* | | Allow unknown values for Map put*Value methods just like every other enum mut...Gravatar Anuraag Agrawal2017-04-07
* | | Merge pull request #2937 from anuraaga/dev_rag2Gravatar Adam Cozzette2017-04-06
|\ \ \
| * | | Fix test for unexpected type url when parsing Any. Currently, the test fails ...Gravatar Anuraag Agrawal2017-04-05
| * | | Fix duplicate fields test. The repeated version is passing because null value...Gravatar Anuraag Agrawal2017-04-04
* | | | Fix error message for int64 parse error.Gravatar Anuraag Agrawal2017-04-03
|/ / /
| * | Update Java version number and dependency.Gravatar Feng Xiao2017-03-30
| * | Fix Java build.Gravatar Feng Xiao2017-03-29
| * | Down-integrate from google3.Gravatar Feng Xiao2017-03-29
|/ /
* | Merge pull request #2860 from prehistoric-penguin/masterGravatar Feng Xiao2017-03-20
|\ \
| * | Remove duplicated copyright statementGravatar prehistoric-penguin2017-03-16
* | | Changed scope of Java deps to "test".Gravatar Josh Haberman2017-03-15
|/ /
* | Merge pull request #2835 from pherl/javaepGravatar Jisi Liu2017-03-13
|\ \