aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Expand)AuthorAge
* Merge pull request #327 from skippy/build-cleanupGravatar Chris Fallin2015-05-01
|\
| * build cleanupsGravatar Adam Greene2015-05-01
|/
* Merge pull request #325 from TeBoring/masterGravatar Jisi Liu2015-04-30
|\
| * Generate pbconfig.h in generate_descriptor_proto.shGravatar Bo Yang2015-04-30
|/
* Merge pull request #315 from brianduff/sync_from_aospGravatar Jisi Liu2015-04-29
|\
* \ Merge pull request #303 from xfxyjwf/wktGravatar Feng Xiao2015-04-29
|\ \
| | * Generate a CREATOR for each Parcelable message.Gravatar Jeff Davidson2015-04-28
| | * Throw OutOfSpaceException instead of IllegalArgumentException.Gravatar Charles Munger2015-04-28
| | * Inline unknownFieldData{Equals,HashCode} to generated code.Gravatar Brian Duff2015-04-28
| | * Expose generate_clear as an option.Gravatar Brian Duff2015-04-28
| | * Generate @IntDef annotations for nanoproto enums.Gravatar Jeff Davidson2015-04-28
| | * Add reset() and position() to CodedOutputByteBufferNano.Gravatar Shai Barack2015-04-28
| | * DO NOT MERGE Overloading createMessageTyped to accept a tag as an integer.Gravatar Kweku Adams2015-04-28
| | * Exclude cachedSize when printing fields.Gravatar Brian Duff2015-04-28
| | * Add clone() method support for nano.Gravatar Brian Duff2015-04-28
| | * When no clear() is generated, still initialize fields.Gravatar Brian Duff2015-04-28
| | * Fix comments.Gravatar Brian Duff2015-04-28
| | * Optimize measurement and serialization of nano protos.Gravatar Charles Munger2015-04-28
| | * Fix bug with large extension field numbers.Gravatar Brian Duff2015-04-28
| |/ |/|
| * Include well-known type protos in "make install".Gravatar Feng Xiao2015-04-23
|/
* Merge pull request #287 from zhangkun83/protoc-artifacts-fixupGravatar Jisi Liu2015-04-21
|\
* \ Merge pull request #290 from xfxyjwf/wktGravatar Feng Xiao2015-04-20
|\ \
| * | Include all well-known type protos.Gravatar Feng Xiao2015-04-20
|/ /
| * A few fix-ups.Gravatar Kun Zhang2015-04-16
|/
* Factored conformance tests so they can run in-process.Gravatar Josh Haberman2015-04-15
* Merge pull request #284 from cfallin/issue-283Gravatar Joshua Haberman2015-04-13
|\
| * Bump gem version to release bugfix.Gravatar Chris Fallin2015-04-13
| * Fixed issue #283: crash in JSON handler cleanup.Gravatar Chris Fallin2015-04-13
|/
* Merge pull request #276 from tamird/drop-apputils-dependencyGravatar Joshua Haberman2015-04-11
|\
| * [PYTHON] Drop dependency on 'google.apputils'.Gravatar Tamir Duberstein2015-04-10
| * [PYTHON] Remove awkward duplicate testsGravatar Tamir Duberstein2015-04-10
| * [PYTHON] README: explain homebrew shenanigansGravatar Tamir Duberstein2015-04-10
| * [PYTHON] Remove unnecessary `include_dir`Gravatar Tamir Duberstein2015-04-10
| * [PYTHON] Clarify API version commentGravatar Tamir Duberstein2015-04-10
|/
* Merge pull request #278 from haberman/python-travisGravatar Joshua Haberman2015-04-09
|\
| * Export LD_LIBRARY_PATH.Gravatar Josh Haberman2015-04-09
| * Fix for current directory in Travis tests.Gravatar Josh Haberman2015-04-09
| * Added Python to Travis build and clarified setup instructions.Gravatar Josh Haberman2015-04-09
|/
* Merge pull request #271 from zhangkun83/protoc-artifact-mavenGravatar Jisi Liu2015-04-09
|\
* \ Merge pull request #275 from tamird/remove-useless-fileGravatar Joshua Haberman2015-04-08
|\ \
| * | Remove useless file that doesn't loadGravatar Tamir Duberstein2015-04-08
|/ /
* | Merge gerrit/master and github/master.Gravatar Feng Xiao2015-04-08
|\ \
| * | Added first version of conformance tests.Gravatar Josh Haberman2015-04-08
| | * Strip Mac artifactsGravatar Kun Zhang2015-04-08
| | * Make the osx binary compatible with 10.7 and laterGravatar Kun Zhang2015-04-08
| | * Fix osx dependency check. otool prints the file name in the first line. Shoul...Gravatar Kun Zhang2015-04-07
| | * Add cross-compilation for Windows on Linux using MinGW. Check library depende...Gravatar Kun Zhang2015-04-07
| | * List the platforms that we currently support. Document staging.repository.Gravatar Kun Zhang2015-04-07
| | * Process to deploy artifacts for multiple platforms into a singleGravatar Kun Zhang2015-04-06
| |/ |/|
* | Merge pull request #264 from tamird/getbytesGravatar Feng Xiao2015-04-02
|\ \