aboutsummaryrefslogtreecommitdiff
path: root/java
AgeCommit message (Expand)Author
2018-09-10Merge pull request #5122 from elharo/guava20Feng Xiao
2018-09-07Merge pull request #5109 from haberman/integrateJoshua Haberman
2018-09-07Reverted changes to map_lite_test.proto.Josh Haberman
2018-09-07update to Guava 20Elliotte Rusty Harold
2018-09-06Update README.md with gradle instructions for javaKyle Krueger
2018-09-04Down-integrate from google3.Josh Haberman
2018-08-27update versionElliotte Harold
2018-08-22Replace repo links.Feng Xiao
2018-08-09Fix failing tests.Feng Xiao
2018-08-08Merge master branch.Feng Xiao
2018-08-08Down-integrate from google3.Feng Xiao
2018-08-07Fix typo in FieldMaskTree.java warningAleksej Kazmin
2018-08-01Merge branch '3.6.x' into merge-3-6-xAdam Cozzette
2018-07-30Ignore unknown enum received in json when ignoreUnknownFields flag is set (#4...vijay-bhatt
2018-07-27Updated version numbers to 3.6.1Adam Cozzette
2018-07-23Store the class object itself (#4927)Jonathan Haber
2018-06-25Merge branch '3.6.x' into merge-3-6-xAdam Cozzette
2018-06-11Merge pull request #2811 from Dunemaster/masterFeng Xiao
2018-05-14Update version number to 3.6.0Jisi Liu
2018-05-11Remove unsafe no-copy String allocation since it's not useful in recent Java ...Anuraag Agrawal
2018-04-12Cleanup + documentation for Java Lite runtime.Feng Xiao
2018-04-02Merge branch (#4466)Paul Yang
2018-03-20Added map_lite_test.proto to fix LiteTestAdam Cozzette
2018-03-13Integrated internal changes from GoogleAdam Cozzette
2018-01-25Drop java 6 supportDavid Ostrovsky
2018-01-22fix typo in FieldMaskTree.java commentkenji yoshida
2018-01-03Merge remote-tracking branch 'origin/3.5.x' into masterJisi Liu
2017-12-19Update version number to 3.5.1Jisi Liu
2017-12-13Add deprecation annotation for oneof case.Jisi Liu
2017-12-01Merge branch 'master' into down-integrateAdam Cozzette
2017-12-01Integrated internal changes from GoogleAdam Cozzette
2017-11-30Merge branch '3.5.x' into 3.5.x-mergeAdam Cozzette
2017-11-29Add a UTF-8 decoder that uses Unsafe to directly decode a byte buffer.Anuraag Agrawal
2017-11-02Update version number to 3.5.0Jisi Liu
2017-10-26Add missing filesJisi Liu
2017-10-25Merge remote-tracking branch 'origin/3.4.x' into masterJisi Liu
2017-10-18Merge pull request #3578 from pherl/filedeprecationJisi Liu
2017-10-18Merge from google internalJisi Liu
2017-10-11Merge remote-tracking branch 'origin/3.4.x' into masterJisi Liu
2017-09-14Bump version for minor releaseJisi Liu
2017-09-14Integrated internal changes from GoogleAdam Cozzette
2017-08-31Add TODOJisi Liu
2017-08-31Add @Deprecated annotation support for proto file.Jisi Liu
2017-08-18Merge remote-tracking branch 'origin/3.4.x' into mergemasterJisi Liu
2017-08-08PROTBUF-3394 Potential SIGBUS with UnsafeUtil.getLongalanbur
2017-07-25Remove dependency on guava 20Jisi Liu
2017-07-25Merge from masterJisi Liu
2017-07-24Update version number for 3.4.0Jisi Liu
2017-07-18Merge from Google internal for 3.4 releaseJisi Liu
2017-07-18Merge 3.3.x into masterBo Yang
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-16 10:59:55 +0000