aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #101 from fizbin/fix_large_proto_java_codeFeng Xiao2015-05-075-26/+116
|\
| * More 'int' return value documentationDaniel Martin2015-04-091-1/+5
| * CR feedback: spacing, document return valuesDaniel Martin2015-04-082-1/+5
| * Fix java compilation issues when processing large .proto filesDaniel Martin2014-11-255-25/+107
* | Merge pull request #349 from haberman/conformance-java-travisJoshua Haberman2015-05-062-2/+3
|\ \
| * | Run conformance tests against Java for the Travis build.Josh Haberman2015-05-062-2/+3
* | | Merge pull request #331 from thomasvl/objc_alpha1_dropPaul Yang2015-05-06165-3/+82460
|\ \ \
| * | | Alpha 1 drop of Google's Objective C plugin and runtime support for protobufs.Thomas Van Lenten2015-05-06165-3/+82460
* | | | Merge pull request #281 from tamird/cleanup-setup-pyJoshua Haberman2015-05-0621-106/+114
|\ \ \ \ | |_|/ / |/| | |
| * | | Noramlize 'setup.py' to fit conventions:Tamir Duberstein2015-05-062-86/+93
| * | | [PYTHON] gitignore eggsTamir Duberstein2015-05-061-0/+1
| * | | WhitespaceTamir Duberstein2015-05-061-1/+1
| * | | Don't hard-code the python pathTamir Duberstein2015-05-0619-19/+19
|/ / /
* | | Merge Gerrit master into GitHub master.Josh Haberman2015-05-064-11/+145
|\ \ \
| * | | Added conformance test support for Java.Josh Haberman2015-04-164-11/+145
* | | | Merge pull request #334 from skippy/allow-msg-to-accept-nilChris Fallin2015-05-023-6/+15
|\ \ \ \
| * | | | allow a message field to be unsetAdam Greene2015-05-024-7/+16
* | | | | Merge pull request #332 from skippy/nil-out-of-boundsChris Fallin2015-05-027-26/+85
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | return nil if array index indicie is out of boundsAdam Greene2015-05-017-26/+85
* | | | | Merge pull request #328 from skippy/add-sizeChris Fallin2015-05-015-3/+57
|\| | | |
| * | | | add size alias for lengthAdam Greene2015-05-015-3/+57
|/ / / /
* | | | Merge pull request #327 from skippy/build-cleanupChris Fallin2015-05-013-2/+3
|\ \ \ \
| * | | | build cleanupsAdam Greene2015-05-013-2/+3
|/ / / /
* | | | Merge pull request #325 from TeBoring/masterJisi Liu2015-04-301-0/+1
|\ \ \ \ | | |/ / | |/| |
| * | | Generate pbconfig.h in generate_descriptor_proto.shBo Yang2015-04-301-0/+1
|/ / /
* | | Merge pull request #315 from brianduff/sync_from_aospJisi Liu2015-04-2926-90/+703
|\ \ \
| * | | Generate a CREATOR for each Parcelable message.Jeff Davidson2015-04-281-0/+11
| * | | Throw OutOfSpaceException instead of IllegalArgumentException.Charles Munger2015-04-282-1/+28
| * | | Inline unknownFieldData{Equals,HashCode} to generated code.Brian Duff2015-04-283-35/+19
| * | | Expose generate_clear as an option.Brian Duff2015-04-281-0/+2
| * | | Generate @IntDef annotations for nanoproto enums.Jeff Davidson2015-04-285-9/+91
| * | | Add reset() and position() to CodedOutputByteBufferNano.Shai Barack2015-04-281-0/+17
| * | | DO NOT MERGE Overloading createMessageTyped to accept a tag as an integer.Kweku Adams2015-04-282-13/+13
| * | | Exclude cachedSize when printing fields.Brian Duff2015-04-281-0/+4
| * | | Add clone() method support for nano.Brian Duff2015-04-2820-10/+222
| * | | When no clear() is generated, still initialize fields.Brian Duff2015-04-284-12/+36
| * | | Fix comments.Brian Duff2015-04-281-2/+2
| * | | Optimize measurement and serialization of nano protos.Charles Munger2015-04-282-23/+251
| * | | Fix bug with large extension field numbers.Brian Duff2015-04-284-9/+31
* | | | Merge pull request #303 from xfxyjwf/wktFeng Xiao2015-04-291-1/+11
|\ \ \ \ | |/ / / |/| | |
| * | | Include well-known type protos in "make install".Feng Xiao2015-04-231-1/+11
|/ / /
* | | Merge pull request #287 from zhangkun83/protoc-artifacts-fixupJisi Liu2015-04-212-4/+11
|\ \ \
| * | | A few fix-ups.Kun Zhang2015-04-162-4/+11
| |/ /
* | | Merge pull request #290 from xfxyjwf/wktFeng Xiao2015-04-208-21/+425
|\ \ \ | |/ / |/| |
| * | Include all well-known type protos.Feng Xiao2015-04-208-21/+425
|/ /
* | Factored conformance tests so they can run in-process.Josh Haberman2015-04-155-199/+415
* | Merge pull request #284 from cfallin/issue-283Joshua Haberman2015-04-133-2/+26
|\ \
| * | Bump gem version to release bugfix.Chris Fallin2015-04-131-1/+1
| * | Fixed issue #283: crash in JSON handler cleanup.Chris Fallin2015-04-132-1/+25
|/ /
* | Merge pull request #276 from tamird/drop-apputils-dependencyJoshua Haberman2015-04-1124-278/+132
|\ \