Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #382 from jtattermusch/integrate_from_master | Jie Luo | 2015-05-13 | 255 | -323/+84482 |
|\ | |||||
| * | Regenerate UnittestDropUnknownFields.cs | Jan Tattermusch | 2015-05-13 | 1 | -2/+2 |
| * | Merge branch 'master' of github.com:google/protobuf into integrate_from_master | Jan Tattermusch | 2015-05-13 | 254 | -321/+84480 |
| |\ | |||||
| | * | Merge pull request #371 from zhangkun83/docker | Jisi Liu | 2015-05-12 | 2 | -1/+60 |
| | |\ | |||||
| | | * | Dockerfile for building protoc on Centos 6.6 | Kun Zhang | 2015-05-12 | 2 | -1/+60 |
| | * | | Merge pull request #369 from ensonic/master | Feng Xiao | 2015-05-12 | 2 | -6/+2 |
| | |\ \ | | | |/ | | |/| | |||||
| | | * | Uncomment conflict fields from pkg-config files. | Stefan Sauer | 2015-05-12 | 2 | -6/+2 |
| | |/ | |||||
| | * | Merge pull request #255 from btabibian/master | Joshua Haberman | 2015-05-07 | 1 | -1/+1 |
| | |\ | |||||
| | | * | mend | Behzad Tabibian | 2015-05-07 | 1 | -1/+1 |
| | | * | adding globals() to exec call for python3 compatibility | Behzad Tabibian | 2015-04-28 | 1 | -1/+1 |
| | * | | Merge branch 'gerrit' to 'master' | Feng Xiao | 2015-05-07 | 13 | -15/+265 |
| | |\ \ | |||||
| | | * | | Modify directory to use in test | Bo Yang | 2015-04-27 | 2 | -0/+10 |
| | | * | | Handle un-handled cases of TestOneof2 in unittest | Bo Yang | 2015-04-27 | 1 | -0/+9 |
| | | * | | internal changes | Bo Yang | 2015-04-24 | 10 | -15/+246 |
| | * | | | Merge pull request #345 from brianduff/update_aosp_again | Jisi Liu | 2015-05-07 | 1 | -0/+2 |
| | |\ \ \ | |||||
| | | * | | | Handle 0-length byte buffers in micro and nano protobufs | Andre Eisenbach | 2015-05-04 | 1 | -0/+2 |
| | * | | | | Merge pull request #101 from fizbin/fix_large_proto_java_code | Feng Xiao | 2015-05-07 | 5 | -26/+116 |
| | |\ \ \ \ | |||||
| | | * | | | | More 'int' return value documentation | Daniel Martin | 2015-04-09 | 1 | -1/+5 |
| | | * | | | | CR feedback: spacing, document return values | Daniel Martin | 2015-04-08 | 2 | -1/+5 |
| | | * | | | | Fix java compilation issues when processing large .proto files | Daniel Martin | 2014-11-25 | 5 | -25/+107 |
| | * | | | | | Merge pull request #349 from haberman/conformance-java-travis | Joshua Haberman | 2015-05-06 | 2 | -2/+3 |
| | |\ \ \ \ \ | |||||
| | | * | | | | | Run conformance tests against Java for the Travis build. | Josh Haberman | 2015-05-06 | 2 | -2/+3 |
| | * | | | | | | Merge pull request #331 from thomasvl/objc_alpha1_drop | Paul Yang | 2015-05-06 | 165 | -3/+82460 |
| | |\ \ \ \ \ \ | |||||
| | | * | | | | | | Alpha 1 drop of Google's Objective C plugin and runtime support for protobufs. | Thomas Van Lenten | 2015-05-06 | 165 | -3/+82460 |
| | * | | | | | | | Merge pull request #281 from tamird/cleanup-setup-py | Joshua Haberman | 2015-05-06 | 21 | -106/+114 |
| | |\ \ \ \ \ \ \ | | | |_|/ / / / / | | |/| | | | | | | |||||
| | | * | | | | | | Noramlize 'setup.py' to fit conventions: | Tamir Duberstein | 2015-05-06 | 2 | -86/+93 |
| | | * | | | | | | [PYTHON] gitignore eggs | Tamir Duberstein | 2015-05-06 | 1 | -0/+1 |
| | | * | | | | | | Whitespace | Tamir Duberstein | 2015-05-06 | 1 | -1/+1 |
| | | * | | | | | | Don't hard-code the python path | Tamir Duberstein | 2015-05-06 | 19 | -19/+19 |
| | |/ / / / / / | |||||
| | * | | | | | | Merge Gerrit master into GitHub master. | Josh Haberman | 2015-05-06 | 4 | -11/+145 |
| | |\ \ \ \ \ \ | | | |_|_|/ / / | | |/| | | | | | |||||
| | | * | | | | | Added conformance test support for Java. | Josh Haberman | 2015-04-16 | 4 | -11/+145 |
| | * | | | | | | Merge pull request #334 from skippy/allow-msg-to-accept-nil | Chris Fallin | 2015-05-02 | 3 | -6/+15 |
| | |\ \ \ \ \ \ | |||||
| | | * | | | | | | allow a message field to be unset | Adam Greene | 2015-05-02 | 4 | -7/+16 |
| | * | | | | | | | Merge pull request #332 from skippy/nil-out-of-bounds | Chris Fallin | 2015-05-02 | 7 | -26/+85 |
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | |/| | | | | | | |||||
| | | * | | | | | | return nil if array index indicie is out of bounds | Adam Greene | 2015-05-01 | 7 | -26/+85 |
| | * | | | | | | | Merge pull request #328 from skippy/add-size | Chris Fallin | 2015-05-01 | 5 | -3/+57 |
| | |\| | | | | | | |||||
| | | * | | | | | | add size alias for length | Adam Greene | 2015-05-01 | 5 | -3/+57 |
| | |/ / / / / / | |||||
| | * | | | | | | Merge pull request #327 from skippy/build-cleanup | Chris Fallin | 2015-05-01 | 3 | -2/+3 |
| | |\ \ \ \ \ \ | |||||
| | | * | | | | | | build cleanups | Adam Greene | 2015-05-01 | 3 | -2/+3 |
| | |/ / / / / / | |||||
| | * | | | | | | Merge pull request #325 from TeBoring/master | Jisi Liu | 2015-04-30 | 1 | -0/+1 |
| | |\ \ \ \ \ \ | | | | |/ / / / | | | |/| | | | | |||||
| | | * | | | | | Generate pbconfig.h in generate_descriptor_proto.sh | Bo Yang | 2015-04-30 | 1 | -0/+1 |
| | |/ / / / / | |||||
| | * | | | | | Merge pull request #315 from brianduff/sync_from_aosp | Jisi Liu | 2015-04-29 | 26 | -90/+703 |
| | |\ \ \ \ \ | |||||
| | | * | | | | | Generate a CREATOR for each Parcelable message. | Jeff Davidson | 2015-04-28 | 1 | -0/+11 |
| | | * | | | | | Throw OutOfSpaceException instead of IllegalArgumentException. | Charles Munger | 2015-04-28 | 2 | -1/+28 |
| | | * | | | | | Inline unknownFieldData{Equals,HashCode} to generated code. | Brian Duff | 2015-04-28 | 3 | -35/+19 |
| | | * | | | | | Expose generate_clear as an option. | Brian Duff | 2015-04-28 | 1 | -0/+2 |
| | | * | | | | | Generate @IntDef annotations for nanoproto enums. | Jeff Davidson | 2015-04-28 | 5 | -9/+91 |
| | | * | | | | | Add reset() and position() to CodedOutputByteBufferNano. | Shai Barack | 2015-04-28 | 1 | -0/+17 |
| | | * | | | | | DO NOT MERGE Overloading createMessageTyped to accept a tag as an integer. | Kweku Adams | 2015-04-28 | 2 | -13/+13 |
| | | * | | | | | Exclude cachedSize when printing fields. | Brian Duff | 2015-04-28 | 1 | -0/+4 |