aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of github.com:google/protobuf into integrate_from_masterJan Tattermusch2015-05-13254-321/+84480
|\
| * Merge pull request #371 from zhangkun83/dockerJisi Liu2015-05-122-1/+60
| |\
| | * Dockerfile for building protoc on Centos 6.6Kun Zhang2015-05-122-1/+60
| * | Merge pull request #369 from ensonic/masterFeng Xiao2015-05-122-6/+2
| |\ \ | | |/ | |/|
| | * Uncomment conflict fields from pkg-config files.Stefan Sauer2015-05-122-6/+2
| |/
| * Merge pull request #255 from btabibian/masterJoshua Haberman2015-05-071-1/+1
| |\
| | * mendBehzad Tabibian2015-05-071-1/+1
| | * adding globals() to exec call for python3 compatibilityBehzad Tabibian2015-04-281-1/+1
| * | Merge branch 'gerrit' to 'master'Feng Xiao2015-05-0713-15/+265
| |\ \
| | * | Modify directory to use in testBo Yang2015-04-272-0/+10
| | * | Handle un-handled cases of TestOneof2 in unittestBo Yang2015-04-271-0/+9
| | * | internal changesBo Yang2015-04-2410-15/+246
| * | | Merge pull request #345 from brianduff/update_aosp_againJisi Liu2015-05-071-0/+2
| |\ \ \
| | * | | Handle 0-length byte buffers in micro and nano protobufsAndre Eisenbach2015-05-041-0/+2
| * | | | 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
generated by cgit v1.2.3 (git 2.39.1) at 2024-09-13 00:04:51 +0000