Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| | * | | | | Remove a static initializer by removing a global of non-POD type. | Peter Kasting | 2015-08-27 | 2 | -63/+78 | |
| | | |/ / | | |/| | | ||||||
| * | | | | Merge pull request #569 from redivo/master | Feng Xiao | 2015-08-28 | 1 | -5/+5 | |
| |\ \ \ \ | | |_|_|/ | |/| | | | ||||||
| | * | | | Fix GOOGLE_PROTOBUF_ATOMICOPS_ERROR syntax error | George Redivo | 2015-07-06 | 1 | -5/+5 | |
| * | | | | Merge pull request #768 from pkasting/time | Feng Xiao | 2015-08-28 | 1 | -1/+0 | |
| |\ \ \ \ | | |_|/ / | |/| | | | ||||||
| | * | | | Delete kNanosPerSecond from time.cc. | Peter Kasting | 2015-08-27 | 1 | -1/+0 | |
| | | |/ | | |/| | ||||||
| * | | | Merge pull request #746 from zmodem/fix_predict_macros2 | Feng Xiao | 2015-08-27 | 1 | -2/+2 | |
| |\ \ \ | ||||||
| | * | | | Fix the no-op definitions of GOOGLE_PREDICT_{TRUE,FALSE} | Hans Wennborg | 2015-08-26 | 1 | -2/+2 | |
| * | | | | Merge pull request #767 from pkasting/port | Feng Xiao | 2015-08-27 | 1 | -6/+10 | |
| |\ \ \ \ | | |_|/ / | |/| | | | ||||||
| | * | | | Avoid #including system headers from inside a namespace. | Peter Kasting | 2015-08-27 | 1 | -6/+10 | |
| |/ / / | ||||||
* | | | | Merge pull request #776 from haberman/pyfix | Joshua Haberman | 2015-08-29 | 1 | -15/+18 | |
|\ \ \ \ | ||||||
| * | | | | Fixed assignment syntax error. | Josh Haberman | 2015-08-28 | 1 | -1/+1 | |
| * | | | | Fix for https://github.com/google/protobuf/issues/758 | Josh Haberman | 2015-08-28 | 1 | -14/+17 | |
|/ / / / | ||||||
* | | | | Merge pull request #765 from xfxyjwf/javadoc | Feng Xiao | 2015-08-27 | 4 | -24/+25 | |
|\ \ \ \ | ||||||
| * | | | | Fix javadoc errors. | Feng Xiao | 2015-08-27 | 4 | -24/+25 | |
|/ / / / | ||||||
* | | | | Merge pull request #759 from TeBoring/beta-1-2v3.0.0-beta-1v3.0.0-alpha-4 | Feng Xiao | 2015-08-27 | 1 | -5/+19 | |
|\ \ \ \ | ||||||
| * | | | | Fix Protobuf.podspec | TeBoring | 2015-08-26 | 1 | -5/+19 | |
* | | | | | Merge pull request #757 from xfxyjwf/python_failure | Jisi Liu | 2015-08-26 | 1 | -0/+7 | |
|\ \ \ \ \ | ||||||
| * | | | | | Excludes a failing python cpp test case. | Feng Xiao | 2015-08-26 | 1 | -0/+7 | |
|/ / / / / | ||||||
* | | | | | Make jruby use Java 3.0.0-alpha-3. | Feng Xiao | 2015-08-26 | 1 | -1/+1 | |
* | | | | | Update generated file. | Feng Xiao | 2015-08-26 | 1 | -1/+0 | |
* | | | | | Fix merge conflict. | Feng Xiao | 2015-08-26 | 1 | -1/+0 | |
* | | | | | Merge pull request #756 from TeBoring/beta-1 | Feng Xiao | 2015-08-26 | 1 | -0/+1 | |
|\ \ \ \ \ | ||||||
| * | | | | | Add distribution for objc | Bo Yang | 2015-08-26 | 1 | -0/+2 | |
* | | | | | | Update Makefile.am to include missing files. | Feng Xiao | 2015-08-26 | 1 | -11/+45 | |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | ||||||
| * | | | | | Add missing files in dist. | Feng Xiao | 2015-08-26 | 1 | -1/+21 | |
| | |/ / / | |/| | | | ||||||
* | | | | | Merge pull request #755 from pherl/beta-1 | Jisi Liu | 2015-08-26 | 1 | -0/+3 | |
|\ \ \ \ \ | ||||||
| * | | | | | Add bazel build/workspace into distribution. | Jisi Liu | 2015-08-26 | 1 | -0/+3 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #754 from xfxyjwf/changelog | Feng Xiao | 2015-08-26 | 1 | -0/+106 | |
|\ \ \ \ \ | |_|/ / / |/| | | | | ||||||
| * | | | | Update change log for beta-1. | Feng Xiao | 2015-08-26 | 1 | -0/+106 | |
* | | | | | Merge pull request #750 from TeBoring/beta-1 | Paul Yang | 2015-08-26 | 16 | -29/+457 | |
|\ \ \ \ \ | |/ / / / |/| | | | | ||||||
| * | | | | Fix bugs for objectivec | TeBoring | 2015-08-26 | 16 | -29/+457 | |
* | | | | | Merge branch 'master' of github.com:google/protobuf into beta-1 | Feng Xiao | 2015-08-26 | 3 | -11/+27 | |
|\ \ \ \ \ | | |/ / / | |/| | | | ||||||
| * | | | | Merge pull request #728 from dano/py3_str_compat | Joshua Haberman | 2015-08-26 | 3 | -11/+27 | |
| |\ \ \ \ | ||||||
| | * | | | | Fix metaclass issue on Python 3. Get text handling tests passing on Python 3. | Dan O'Reilly | 2015-08-22 | 3 | -13/+9 | |
| | * | | | | Start work on getting text handled properly on PY3 | Dan O'Reilly | 2015-08-22 | 1 | -7/+27 | |
* | | | | | | Update post_process_dist.sh | Feng Xiao | 2015-08-26 | 1 | -5/+1 | |
* | | | | | | Merge pull request #751 from xfxyjwf/version_number | Feng Xiao | 2015-08-26 | 10 | -14/+14 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Update version number. | Feng Xiao | 2015-08-26 | 10 | -14/+14 | |
* | | | | | | | Merge pull request #752 from google/jtattermusch-patch-1 | Feng Xiao | 2015-08-26 | 1 | -7/+12 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Update README.md for C# | Jan Tattermusch | 2015-08-26 | 1 | -7/+12 | |
|/ / / / / / / | ||||||
* | | | | | | | Merge pull request #749 from xfxyjwf/mingw_endian | Feng Xiao | 2015-08-26 | 1 | -2/+5 | |
|\ \ \ \ \ \ \ | ||||||
| * | | | | | | | Add a TODO to clean-up the LITTLE_ENDIAN macro. | Feng Xiao | 2015-08-26 | 1 | -0/+3 | |
| * | | | | | | | Assume LITTLE_ENDIAN for windows build. | Feng Xiao | 2015-08-26 | 1 | -2/+2 | |
|/ / / / / / / | ||||||
* | | | | | | | Merge pull request #748 from xfxyjwf/unused_typedef | Feng Xiao | 2015-08-26 | 1 | -6/+0 | |
|\| | | | | | | ||||||
| * | | | | | | Remove an unused typedef. | Feng Xiao | 2015-08-26 | 1 | -6/+0 | |
|/ / / / / / | ||||||
* | | | | | | Merge remote-tracking branch 'origin/master' into beta-1 | Feng Xiao | 2015-08-26 | 2 | -1/+14 | |
|\| | | | | | ||||||
| * | | | | | Merge pull request #709 from xfxyjwf/map_bug | Feng Xiao | 2015-08-26 | 2 | -1/+14 | |
| |\ \ \ \ \ | | |_|_|/ / | |/| | | | | ||||||
| | * | | | | Fix map fields parsing. | Feng Xiao | 2015-08-11 | 2 | -1/+14 | |
| * | | | | | Merge pull request #739 from jtattermusch/include_descriptor_proto_master | Jon Skeet | 2015-08-26 | 1 | -0/+1 | |
| |\ \ \ \ \ | ||||||
| | * | | | | | include descriptor.proto in nuget package | Jan Tattermusch | 2015-08-25 | 1 | -0/+1 |