aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Expand)AuthorAge
* Fixing compile errors on Solaris in 64-bit modeGravatar Mohamed El-Tahan2015-09-02
* 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
| | |_|/ / | |/| | |
| * | | | 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
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Fix bugs for objectivecGravatar TeBoring2015-08-26
* | | | | Merge branch 'master' of github.com:google/protobuf into beta-1Gravatar Feng Xiao2015-08-26
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge pull request #728 from dano/py3_str_compatGravatar Joshua Haberman2015-08-26
| |\ \ \ \
* | | | | | Update post_process_dist.shGravatar Feng Xiao2015-08-26
* | | | | | Merge pull request #751 from xfxyjwf/version_numberGravatar Feng Xiao2015-08-26
|\ \ \ \ \ \
* \ \ \ \ \ \ Merge pull request #752 from google/jtattermusch-patch-1Gravatar Feng Xiao2015-08-26
|\ \ \ \ \ \ \
| * | | | | | | Update README.md for C#Gravatar Jan Tattermusch2015-08-26
|/ / / / / / /
| * | | | | | Update version number.Gravatar Feng Xiao2015-08-26
* | | | | | | Merge pull request #749 from xfxyjwf/mingw_endianGravatar Feng Xiao2015-08-26
|\ \ \ \ \ \ \
| * | | | | | | Add a TODO to clean-up the LITTLE_ENDIAN macro.Gravatar Feng Xiao2015-08-26
| * | | | | | | Assume LITTLE_ENDIAN for windows build.Gravatar Feng Xiao2015-08-26
|/ / / / / / /
* | | | | | | Merge pull request #748 from xfxyjwf/unused_typedefGravatar Feng Xiao2015-08-26
|\| | | | | |
| * | | | | | Remove an unused typedef.Gravatar Feng Xiao2015-08-26
|/ / / / / /
* | | | | | Merge remote-tracking branch 'origin/master' into beta-1Gravatar Feng Xiao2015-08-26
|\| | | | |
| * | | | | Merge pull request #709 from xfxyjwf/map_bugGravatar Feng Xiao2015-08-26
| |\ \ \ \ \
* | \ \ \ \ \ Merge pull request #747 from jtattermusch/sign_mismatchGravatar Feng Xiao2015-08-26
|\ \ \ \ \ \ \
| * | | | | | | add static cast to silence signedness comparison warningGravatar Jan Tattermusch2015-08-26
|/ / / / / / /