aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Expand)AuthorAge
* Merge pull request #766 from pkasting/hashGravatar Feng Xiao2015-09-10
|\
* \ Merge pull request #802 from bsilver8192/masterGravatar Feng Xiao2015-09-08
|\ \
| * | Don't assume char is signed.Gravatar Brian Silverman2015-09-08
| * | Use TEST_TMPDIR for writing temporary files if it's set.Gravatar Brian Silverman2015-09-08
|/ /
* | Merge pull request #786 from pherl/masterGravatar Jisi Liu2015-09-08
|\ \
| * | Update objc script in generate_descriptor_proto.shGravatar Jisi Liu2015-09-08
* | | Merge pull request #796 from jcanizales/add-missing-commaGravatar Paul Yang2015-09-04
|\ \ \
| * | | Fix podspec by adding missing commaGravatar Jorge Canizales2015-09-04
|/ / /
* | | Merge pull request #794 from jskeet/anyGravatar Jan Tattermusch2015-09-04
|\ \ \
| * | | Pack/Unpack implementation for Any.Gravatar Jon Skeet2015-09-04
|/ / /
* | | Merge pull request #772 from dano/fix_scalar_mapGravatar Joshua Haberman2015-09-04
|\ \ \
* \ \ \ Merge pull request #793 from kbinani/fix_redefinition_BYTE_SIZE_macroGravatar Feng Xiao2015-09-03
|\ \ \ \ | |_|/ / |/| | |
| * | | Rename 'BYTE_SIZE' macro to 'GOOGLE_PROTOBUF_BYTE_SIZE'Gravatar kbinani2015-09-04
|/ / /
| * / Fix Python 3.4 cpp implementationGravatar Dan O'Reilly2015-08-31
|/ /
* | Merge remote-tracking branch 'origin/master' into beta-1Gravatar Feng Xiao2015-08-29
|\ \
* \ \ Merge pull request #776 from haberman/pyfixGravatar Joshua Haberman2015-08-29
|\ \ \
| * | | Fixed assignment syntax error.Gravatar Josh Haberman2015-08-28
| * | | Fix for https://github.com/google/protobuf/issues/758Gravatar Josh Haberman2015-08-28
|/ / /
| * | Merge pull request #770 from pkasting/string_spaceGravatar Feng Xiao2015-08-28
| |\ \
| * \ \ Merge pull request #771 from pkasting/static_init_1Gravatar Feng Xiao2015-08-28
| |\ \ \
| * \ \ \ Merge pull request #569 from redivo/masterGravatar Feng Xiao2015-08-28
| |\ \ \ \
| * \ \ \ \ Merge pull request #768 from pkasting/timeGravatar Feng Xiao2015-08-28
| |\ \ \ \ \
| | | | * | | Remove a static initializer by removing a global of non-POD type.Gravatar Peter Kasting2015-08-27
| | |_|/ / / | |/| | | |
| | | | | * It helps if you write macros correctlyGravatar Peter Kasting2015-08-27
| | | | | * Try modifying check in hopes of passing upstream buildGravatar Peter Kasting2015-08-27
| | | | | * Review commentsGravatar Peter Kasting2015-08-27
| | | | | * Refine check for unordered_{map|set} availability.Gravatar Peter Kasting2015-08-27
| | |_|_|/ | |/| | |
| * | | | Merge pull request #746 from zmodem/fix_predict_macros2Gravatar Feng Xiao2015-08-27
| |\ \ \ \
| * \ \ \ \ Merge pull request #767 from pkasting/portGravatar Feng Xiao2015-08-27
| |\ \ \ \ \
| | | | | | * Move StringSpaceUsedIncludingSelf to lite library.Gravatar Peter Kasting2015-08-27
| | |_|_|_|/ | |/| | | |
* | | | | | Merge pull request #765 from xfxyjwf/javadocGravatar Feng Xiao2015-08-27
|\ \ \ \ \ \
| | | | | * | Delete kNanosPerSecond from time.cc.Gravatar Peter Kasting2015-08-27
| | | |_|/ / | | |/| | |
| | | * | | Avoid #including system headers from inside a namespace.Gravatar Peter Kasting2015-08-27
| | |/ / /
| * / / / Fix javadoc errors.Gravatar Feng Xiao2015-08-27
|/ / / /
* | | | Merge pull request #759 from TeBoring/beta-1-2Gravatar Feng Xiao2015-08-27
|\ \ \ \
| * | | | Fix Protobuf.podspecGravatar TeBoring2015-08-26
* | | | | Merge pull request #757 from xfxyjwf/python_failureGravatar Jisi Liu2015-08-26
|\ \ \ \ \
| * | | | | Excludes a failing python cpp test case.Gravatar Feng Xiao2015-08-26
|/ / / / /
* | | | | Make jruby use Java 3.0.0-alpha-3.Gravatar Feng Xiao2015-08-26
* | | | | Update generated file.Gravatar Feng Xiao2015-08-26
* | | | | Fix merge conflict.Gravatar Feng Xiao2015-08-26
* | | | | Merge pull request #756 from TeBoring/beta-1Gravatar Feng Xiao2015-08-26
|\ \ \ \ \
* \ \ \ \ \ Update Makefile.am to include missing files.Gravatar Feng Xiao2015-08-26
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Add missing files in dist.Gravatar Feng Xiao2015-08-26
| | |/ / / | |/| | |
| | * | | Add distribution for objcGravatar Bo Yang2015-08-26
* | | | | Merge pull request #755 from pherl/beta-1Gravatar Jisi Liu2015-08-26
|\ \ \ \ \
| * | | | | Add bazel build/workspace into distribution.Gravatar Jisi Liu2015-08-26
|/ / / / /
* | | | | Merge pull request #754 from xfxyjwf/changelogGravatar Feng Xiao2015-08-26
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Update change log for beta-1.Gravatar Feng Xiao2015-08-26
* | | | | Merge pull request #750 from TeBoring/beta-1Gravatar Paul Yang2015-08-26
|\ \ \ \ \ | |/ / / / |/| | | |