Commit message (Expand) | Author | Age | |
---|---|---|---|
* | Fixing compile errors on Solaris in 64-bit mode | Mohamed El-Tahan | 2015-09-02 |
* | Merge remote-tracking branch 'origin/master' into beta-1 | Feng Xiao | 2015-08-29 |
|\ | |||
* \ | Merge pull request #776 from haberman/pyfix | Joshua Haberman | 2015-08-29 |
|\ \ | |||
| * | | Fixed assignment syntax error. | Josh Haberman | 2015-08-28 |
| * | | Fix for https://github.com/google/protobuf/issues/758 | Josh Haberman | 2015-08-28 |
|/ / | |||
| * | Merge pull request #770 from pkasting/string_space | Feng Xiao | 2015-08-28 |
| |\ | |||
| * \ | Merge pull request #771 from pkasting/static_init_1 | Feng Xiao | 2015-08-28 |
| |\ \ | |||
| * \ \ | Merge pull request #569 from redivo/master | Feng Xiao | 2015-08-28 |
| |\ \ \ | |||
| * \ \ \ | Merge pull request #768 from pkasting/time | Feng Xiao | 2015-08-28 |
| |\ \ \ \ | |||
| | | | * | | Remove a static initializer by removing a global of non-POD type. | Peter Kasting | 2015-08-27 |
| | |_|/ / | |/| | | | |||
| * | | | | Merge pull request #746 from zmodem/fix_predict_macros2 | Feng Xiao | 2015-08-27 |
| |\ \ \ \ | |||
| * \ \ \ \ | Merge pull request #767 from pkasting/port | Feng Xiao | 2015-08-27 |
| |\ \ \ \ \ | |||
| | | | | | * | Move StringSpaceUsedIncludingSelf to lite library. | Peter Kasting | 2015-08-27 |
| | |_|_|_|/ | |/| | | | | |||
* | | | | | | Merge pull request #765 from xfxyjwf/javadoc | Feng Xiao | 2015-08-27 |
|\ \ \ \ \ \ | |||
| | | | | * | | Delete kNanosPerSecond from time.cc. | Peter Kasting | 2015-08-27 |
| | | |_|/ / | | |/| | | | |||
| | | * | | | Avoid #including system headers from inside a namespace. | Peter Kasting | 2015-08-27 |
| | |/ / / | |||
| * / / / | Fix javadoc errors. | Feng Xiao | 2015-08-27 |
|/ / / / | |||
* | | | | Merge pull request #759 from TeBoring/beta-1-2 | Feng Xiao | 2015-08-27 |
|\ \ \ \ | |||
| * | | | | Fix Protobuf.podspec | TeBoring | 2015-08-26 |
* | | | | | Merge pull request #757 from xfxyjwf/python_failure | Jisi Liu | 2015-08-26 |
|\ \ \ \ \ | |||
| * | | | | | Excludes a failing python cpp test case. | Feng Xiao | 2015-08-26 |
|/ / / / / | |||
* | | | | | Make jruby use Java 3.0.0-alpha-3. | Feng Xiao | 2015-08-26 |
* | | | | | Update generated file. | Feng Xiao | 2015-08-26 |
* | | | | | Fix merge conflict. | Feng Xiao | 2015-08-26 |
* | | | | | Merge pull request #756 from TeBoring/beta-1 | Feng Xiao | 2015-08-26 |
|\ \ \ \ \ | |||
* \ \ \ \ \ | Update Makefile.am to include missing files. | Feng Xiao | 2015-08-26 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | |||
| * | | | | | Add missing files in dist. | Feng Xiao | 2015-08-26 |
| | |/ / / | |/| | | | |||
| | * | | | Add distribution for objc | Bo Yang | 2015-08-26 |
* | | | | | Merge pull request #755 from pherl/beta-1 | Jisi Liu | 2015-08-26 |
|\ \ \ \ \ | |||
| * | | | | | Add bazel build/workspace into distribution. | Jisi Liu | 2015-08-26 |
|/ / / / / | |||
* | | | | | Merge pull request #754 from xfxyjwf/changelog | Feng Xiao | 2015-08-26 |
|\ \ \ \ \ | |_|/ / / |/| | | | | |||
| * | | | | Update change log for beta-1. | Feng Xiao | 2015-08-26 |
* | | | | | Merge pull request #750 from TeBoring/beta-1 | Paul Yang | 2015-08-26 |
|\ \ \ \ \ | |/ / / / |/| | | | | |||
| * | | | | Fix bugs for objectivec | TeBoring | 2015-08-26 |
* | | | | | Merge branch 'master' of github.com:google/protobuf into beta-1 | Feng Xiao | 2015-08-26 |
|\ \ \ \ \ | | |/ / / | |/| | | | |||
| * | | | | Merge pull request #728 from dano/py3_str_compat | Joshua Haberman | 2015-08-26 |
| |\ \ \ \ | |||
* | | | | | | Update post_process_dist.sh | Feng Xiao | 2015-08-26 |
* | | | | | | Merge pull request #751 from xfxyjwf/version_number | Feng Xiao | 2015-08-26 |
|\ \ \ \ \ \ | |||
* \ \ \ \ \ \ | Merge pull request #752 from google/jtattermusch-patch-1 | Feng Xiao | 2015-08-26 |
|\ \ \ \ \ \ \ | |||
| * | | | | | | | Update README.md for C# | Jan Tattermusch | 2015-08-26 |
|/ / / / / / / | |||
| * | | | | | | Update version number. | Feng Xiao | 2015-08-26 |
* | | | | | | | Merge pull request #749 from xfxyjwf/mingw_endian | Feng Xiao | 2015-08-26 |
|\ \ \ \ \ \ \ | |||
| * | | | | | | | Add a TODO to clean-up the LITTLE_ENDIAN macro. | Feng Xiao | 2015-08-26 |
| * | | | | | | | Assume LITTLE_ENDIAN for windows build. | Feng Xiao | 2015-08-26 |
|/ / / / / / / | |||
* | | | | | | | Merge pull request #748 from xfxyjwf/unused_typedef | Feng Xiao | 2015-08-26 |
|\| | | | | | | |||
| * | | | | | | Remove an unused typedef. | Feng Xiao | 2015-08-26 |
|/ / / / / / | |||
* | | | | | | Merge remote-tracking branch 'origin/master' into beta-1 | Feng Xiao | 2015-08-26 |
|\| | | | | | |||
| * | | | | | Merge pull request #709 from xfxyjwf/map_bug | Feng Xiao | 2015-08-26 |
| |\ \ \ \ \ | |||
* | \ \ \ \ \ | Merge pull request #747 from jtattermusch/sign_mismatch | Feng Xiao | 2015-08-26 |
|\ \ \ \ \ \ \ | |||
| * | | | | | | | add static cast to silence signedness comparison warning | Jan Tattermusch | 2015-08-26 |
|/ / / / / / / |