aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Improved SHARED build from CMake projectKonstantin Podsvirov2015-10-156-29/+50
* Add CMake option protobuf_DEBUG_POSTFIXKonstantin Podsvirov2015-09-174-3/+8
* Simplify testing from CMake project to "check" targetKonstantin Podsvirov2015-09-172-25/+17
* Improved testing from CMake projectKonstantin Podsvirov2015-09-161-4/+11
* Rename CMake option BUILD_SHARED_LIBS to protobuf_BUILD_SHARED_LIBSKonstantin Podsvirov2015-09-151-4/+4
* Rename CMake option ZLIB to protobuf_WITH_ZLIBKonstantin Podsvirov2015-09-151-5/+5
* Rename CMake option BUILD_TESTING to protobuf_BUILD_TESTSKonstantin Podsvirov2015-09-151-3/+3
* Improved testing from CMake projectKonstantin Podsvirov2015-09-152-3/+17
* Using NEW behavior for CMP0022 in CMake projectKonstantin Podsvirov2015-09-011-0/+3
* Option for switching static runtime link policy with MSVCKonstantin Podsvirov2015-09-011-7/+10
* Using find_package(ZLIB) with MSVC tooKonstantin Podsvirov2015-08-311-12/+14
* Improved configure.ac parsingKonstantin Podsvirov2015-08-311-15/+27
* Merge remote-tracking branch 'origin/master' into beta-1Feng Xiao2015-08-299-96/+109
|\
| * Merge pull request #770 from pkasting/string_spaceFeng Xiao2015-08-284-19/+14
| |\
| | * Move StringSpaceUsedIncludingSelf to lite library.Peter Kasting2015-08-274-19/+14
| * | Merge pull request #771 from pkasting/static_init_1Feng Xiao2015-08-282-63/+78
| |\ \
| | * | Remove a static initializer by removing a global of non-POD type.Peter Kasting2015-08-272-63/+78
| * | | Merge pull request #569 from redivo/masterFeng Xiao2015-08-281-5/+5
| |\ \ \
| | * | | Fix GOOGLE_PROTOBUF_ATOMICOPS_ERROR syntax errorGeorge Redivo2015-07-061-5/+5
| * | | | Merge pull request #768 from pkasting/timeFeng Xiao2015-08-281-1/+0
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Delete kNanosPerSecond from time.cc.Peter Kasting2015-08-271-1/+0
| | | |/ | | |/|
| * | | Merge pull request #746 from zmodem/fix_predict_macros2Feng Xiao2015-08-271-2/+2
| |\ \ \
| | * | | Fix the no-op definitions of GOOGLE_PREDICT_{TRUE,FALSE}Hans Wennborg2015-08-261-2/+2
| * | | | Merge pull request #767 from pkasting/portFeng Xiao2015-08-271-6/+10
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Avoid #including system headers from inside a namespace.Peter Kasting2015-08-271-6/+10
| |/ / /
* | | | Merge pull request #776 from haberman/pyfixJoshua Haberman2015-08-291-15/+18
|\ \ \ \
| * | | | Fixed assignment syntax error.Josh Haberman2015-08-281-1/+1
| * | | | Fix for https://github.com/google/protobuf/issues/758Josh Haberman2015-08-281-14/+17
|/ / / /
* | | | Merge pull request #765 from xfxyjwf/javadocFeng Xiao2015-08-274-24/+25
|\ \ \ \
| * | | | Fix javadoc errors.Feng Xiao2015-08-274-24/+25
|/ / / /
* | | | Merge pull request #759 from TeBoring/beta-1-2v3.0.0-beta-1v3.0.0-alpha-4Feng Xiao2015-08-271-5/+19
|\ \ \ \
| * | | | Fix Protobuf.podspecTeBoring2015-08-261-5/+19
* | | | | Merge pull request #757 from xfxyjwf/python_failureJisi Liu2015-08-261-0/+7
|\ \ \ \ \
| * | | | | Excludes a failing python cpp test case.Feng Xiao2015-08-261-0/+7
|/ / / / /
* | | | | Make jruby use Java 3.0.0-alpha-3.Feng Xiao2015-08-261-1/+1
* | | | | Update generated file.Feng Xiao2015-08-261-1/+0
* | | | | Fix merge conflict.Feng Xiao2015-08-261-1/+0
* | | | | Merge pull request #756 from TeBoring/beta-1Feng Xiao2015-08-261-0/+1
|\ \ \ \ \
| * | | | | Add distribution for objcBo Yang2015-08-261-0/+2
* | | | | | Update Makefile.am to include missing files.Feng Xiao2015-08-261-11/+45
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Add missing files in dist.Feng Xiao2015-08-261-1/+21
| | |/ / / | |/| | |
* | | | | Merge pull request #755 from pherl/beta-1Jisi Liu2015-08-261-0/+3
|\ \ \ \ \
| * | | | | Add bazel build/workspace into distribution.Jisi Liu2015-08-261-0/+3
|/ / / / /
* | | | | Merge pull request #754 from xfxyjwf/changelogFeng Xiao2015-08-261-0/+106
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | Update change log for beta-1.Feng Xiao2015-08-261-0/+106
* | | | | Merge pull request #750 from TeBoring/beta-1Paul Yang2015-08-2616-29/+457
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Fix bugs for objectivecTeBoring2015-08-2616-29/+457
* | | | | Merge branch 'master' of github.com:google/protobuf into beta-1Feng Xiao2015-08-263-11/+27
|\ \ \ \ \ | | |/ / / | |/| | |
| * | | | Merge pull request #728 from dano/py3_str_compatJoshua Haberman2015-08-263-11/+27
| |\ \ \ \
| | * | | | Fix metaclass issue on Python 3. Get text handling tests passing on Python 3.Dan O'Reilly2015-08-223-13/+9