aboutsummaryrefslogtreecommitdiff
path: root/java
Commit message (Expand)AuthorAgeFilesLines
* Update version number to v3.0.0-preFeng Xiao2014-12-101-2/+2
* Down-integrate from internal code base.Feng Xiao2014-12-092-1/+8
* Remove usage of features not supported in Java 1.6.Feng Xiao2014-12-031-3/+2
* Update version number to v3.0.0-alpha-1Feng Xiao2014-12-031-2/+2
* Explicitly list all Java lite runtime tests (and exclude those dependingFeng Xiao2014-12-021-2/+4
* Merge pull request #102 from fizbin/bytestring_serializableFeng Xiao2014-11-277-1/+90
|\
| * Add tests for other ByteString subclassesDaniel Martin2014-11-272-0/+37
| * Make ByteStrings serializable with java serialization.Daniel Martin2014-11-255-1/+53
* | Make Java TextFormat.printToUnicodeString() escape newlines.Feng Xiao2014-11-252-6/+15
* | Fix javadoc warnings.Feng Xiao2014-11-252-14/+14
|/
* Down-integrate from internal code base.Feng Xiao2014-11-203-22/+26
* Down-integrate from internal code base (C++ maps support).Feng Xiao2014-11-146-17/+49
* Merge branch 'typofixes-vlajos-20141108' of https://github.com/vlajos/protobu...Feng Xiao2014-11-114-7/+7
|\
| * typo fixes - https://github.com/vlajos/misspell_fixerVeres Lajos2014-11-084-7/+7
* | Down-integrate from internal code base.Feng Xiao2014-11-1056-291/+5365
|/
* Update version number to 2.6.2-pre.Feng Xiao2014-10-211-2/+2
* Update version number to 2.6.1.v2.6.1Feng Xiao2014-10-201-2/+2
* Update version number to 2.6.1rc1Feng Xiao2014-10-081-2/+2
* Merge pull request #38 from xfxyjwf/fix17Feng Xiao2014-10-032-3/+38
|\
| * Update verification methods' names.Feng Xiao2014-10-021-6/+8
| * Fix a bug that causes DynamicMessage.setField() to not work for repeatedFeng Xiao2014-10-012-2/+35
* | Fix descriptor validation logic for packed enum fields.Feng Xiao2014-10-012-7/+34
|/
* Replace links to code.google.com/protobuf with developers.google.com/protocol...Feng Xiao2014-10-01102-105/+105
* Bump version for maven-bundle-pluginJisi Liu2014-09-041-1/+1
* merge tags/2.6.0 into trunkjieluo@google.com2014-08-251-1/+1
* 1, Remove unkown field support in jave TextFormatjieluo@google.com2014-07-253-118/+19
* add LazyFieldLite.javajieluo@google.com2014-07-191-0/+176
* add printUnicode methods in TextFormatjieluo@google.com2014-07-181-0/+20
* down integrate to svnjieluo@google.com2014-07-1864-1332/+7588
* Update OSGi meta data.xiaofeng@google.com2013-03-081-1/+3
* Update version number in trunkxiaofeng@google.com2013-02-281-1/+1
* Update version to 2.5.0-preliujisi@google.com2012-11-301-1/+1
* Fix Java compile issues under JDK 1.5xiaofeng@google.com2012-11-305-17/+15
* Fix issue 298: add OSGi configuration to pom.xml - patch from Thomas Kockxiaofeng@google.com2012-10-251-1/+11
* Down-integrate from internal branchxiaofeng@google.com2012-09-2255-697/+7855
* Close resources properly for java tests and examples.liujisi@google.com2011-06-072-6/+15
* Allow String to be used as message names.liujisi@google.com2011-05-041-0/+20
* Update mainline version to 2.4.2-pre.liujisi@google.com2011-05-031-1/+1
* Fix incomplete comments.liujisi@google.com2011-04-281-1/+1
* Make protobuf java JDK 1.5 compatible.liujisi@google.com2011-04-288-35/+77
* Use fully qualified java.lang.Object in protoc java code.liujisi@google.com2011-04-081-1/+5
* Fix issue 256: compute the correct size for negative enum values, which need ...jasonh@google.com2011-02-182-1/+16
* Update mainline version to 2.4.1-pre.liujisi@google.com2011-02-021-1/+1
* Add missing files into pom.xml for protobuf-lite.liujisi@google.com2011-01-271-1/+6
* Escape C++ Trigraphs.liujisi@google.com2010-12-211-0/+1
* Boost version number to 2.4.0-pre, add more test cases for text_format.py abo...liujisi@google.com2010-12-091-1/+1
* Fix issues: 200 202 211 215 237 246.liujisi@google.com2010-12-063-1/+3
* Fix issues: 166 167 172 175 181 188 192 194 195.liujisi@google.com2010-12-031-1/+3
* Submit recent changes from internal branch. See CHANGES.txt for more details.liujisi@google.com2010-11-0248-727/+6146
* Roll back revision 313. A similar but far more exensive change was made in o...kenton@google.com2010-09-172-41/+0