aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* 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
|\
| * [PYTHON] Drop dependency on 'google.apputils'.Tamir Duberstein2015-04-1019-102/+103
| * [PYTHON] Remove awkward duplicate testsTamir Duberstein2015-04-104-165/+0
| * [PYTHON] README: explain homebrew shenanigansTamir Duberstein2015-04-101-8/+26
| * [PYTHON] Remove unnecessary `include_dir`Tamir Duberstein2015-04-101-1/+1
| * [PYTHON] Clarify API version commentTamir Duberstein2015-04-101-2/+2
|/
* Merge pull request #278 from haberman/python-travisJoshua Haberman2015-04-092-10/+19
|\
| * Export LD_LIBRARY_PATH.Josh Haberman2015-04-091-1/+2
| * Fix for current directory in Travis tests.Josh Haberman2015-04-091-2/+2
| * Added Python to Travis build and clarified setup instructions.Josh Haberman2015-04-092-10/+18
|/
* Merge pull request #271 from zhangkun83/protoc-artifact-mavenJisi Liu2015-04-093-12/+162
|\
| * Strip Mac artifactsKun Zhang2015-04-081-2/+9
| * Make the osx binary compatible with 10.7 and laterKun Zhang2015-04-081-1/+3
| * Fix osx dependency check. otool prints the file name in the first line. Shoul...Kun Zhang2015-04-071-2/+2
| * Add cross-compilation for Windows on Linux using MinGW. Check library depende...Kun Zhang2015-04-071-12/+70
| * List the platforms that we currently support. Document staging.repository.Kun Zhang2015-04-072-1/+11
| * Process to deploy artifacts for multiple platforms into a singleKun Zhang2015-04-063-2/+75
* | Merge pull request #275 from tamird/remove-useless-fileJoshua Haberman2015-04-083-665/+0
|\ \
| * | Remove useless file that doesn't loadTamir Duberstein2015-04-083-665/+0
|/ /
* | Merge gerrit/master and github/master.Feng Xiao2015-04-087-2/+871
|\ \ | |/ |/|
| * Added first version of conformance tests.Josh Haberman2015-04-087-2/+871
* | Merge pull request #264 from tamird/getbytesFeng Xiao2015-04-0225-263/+305
|\ \
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-16 03:05:49 +0000