aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Update protoc-artifacts version to 2.6.12.6.1-artifactsJisi Liu2015-04-161-1/+1
* Squash changes for protoc-artifacts support into a single commit, so itzhangkun832015-04-163-0/+476
* Update version number to 2.6.1.v2.6.1Feng Xiao2014-10-204-5/+5
* Don't test for sched_yield on WindowsWilliam Orr2014-10-101-2/+8
* Update CHANGES.txt to include a bug fix.v2.6.1rc1Feng Xiao2014-10-091-0/+1
* Update version number in generated files.Feng Xiao2014-10-092-2/+2
* Update CHANGES.txt for 2.6.1rc1.Feng Xiao2014-10-091-0/+17
* Merge remote-tracking branch 'origin/master' into 2.6.1Feng Xiao2014-10-092-0/+17
|\
| * Merge pull request #43 from abuszta/bugfixFeng Xiao2014-10-092-0/+17
| |\
| | * DestroyDefaultRepeatedFields is registered using OnShutdown.Antoni Buszta2014-10-091-3/+1
| | * InitializeDefaultRepeatedFields() allocates memory but does not release it.Antoni Buszta2014-10-082-0/+19
* | | Update version number to 2.6.1rc1Feng Xiao2014-10-085-8/+8
|/ /
* | Avoid using the macro name again in macro definitions.Feng Xiao2014-10-081-3/+3
* | Fix the memory leak of GetEmptyString().Feng Xiao2014-10-081-1/+5
|/
* Down-integrate from internal branch.Feng Xiao2014-10-074-6/+22
* Merge pull request #35 from dsrosario/fix_warningFeng Xiao2014-10-061-1/+1
|\
| * Fix "warning C4018: '<' : signed/unsigned mismatch" at wire_format_lite_inl.hDinis Rosário2014-09-231-1/+1
* | Merge pull request #38 from xfxyjwf/fix17Feng Xiao2014-10-032-3/+38
|\ \
| * | Update verification methods' names.Feng Xiao2014-10-021-6/+8
| * | Fix a bug that causes DynamicMessage.setField() to not work for repeatedFeng Xiao2014-10-012-2/+35
* | | Down-integrate from internal branch.Feng Xiao2014-10-033-15/+14
* | | Merge pull request #39 from xfxyjwf/fix24Feng Xiao2014-10-022-7/+34
|\ \ \
| * | | Fix descriptor validation logic for packed enum fields.Feng Xiao2014-10-012-7/+34
| |/ /
* | | Merge pull request #3 from dhirschfeld/pyext-fixFeng Xiao2014-10-021-0/+1
|\ \ \ | |/ / |/| |
| * | Explicitly specify pyext/cpp_message.py in py_modules listDavid Hirschfeld2014-08-271-0/+1
* | | Merge pull request #37 from google/fix_linksxfxyjwf2014-10-01398-405/+405
|\ \ \
| * | | Replace links to code.google.com/protobuf with developers.google.com/protocol...Feng Xiao2014-10-01398-405/+405
|/ / /
* | | Merge pull request #32 from worr/bug/solaris-atomicopsxfxyjwf2014-09-235-2/+208
|\ \ \ | |_|/ |/| |
| * | Update CONTRIBUTORS.txtWilliam Orr2014-09-221-1/+4
| * | Update copyright notice and remove first lineWilliam Orr2014-09-221-2/+1
| * | Add support for solaris atomicopsWilliam Orr2014-09-194-1/+205
* | | Merge pull request #31 from worr/bug/autoconf-sched-yieldxfxyjwf2014-09-221-0/+3
|\ \ \ | |/ / |/| |
| * | Add check for sched_yield in librtWilliam Orr2014-09-191-0/+3
|/ /
* | Merge pull request #30 from edmonds/branches/fix_generic_atomicops_memory_modelsxfxyjwf2014-09-191-2/+2
|\ \
| * | generic atomicops: promote Acquire_Store() and Release_Load() to use SEQ_CST ...Robert Edmonds2014-09-181-2/+2
* | | Merge pull request #29 from edmonds/branches/undef_GOOGLE_PROTOBUF_PLATFORM_E...xfxyjwf2014-09-181-0/+2
|\ \ \ | |/ / |/| |
| * | platform_macros.h: #undef GOOGLE_PROTOBUF_PLATFORM_ERROR once it's no longer ...Robert Edmonds2014-09-181-0/+2
* | | Merge pull request #27 from edmonds/branches/fix_generic_atomicops_non_clangxfxyjwf2014-09-182-7/+20
|\| |
| * | Fix atomicops build failure on non-ClangRobert Edmonds2014-09-182-7/+20
|/ /
* | Merge pull request #21 from edmonds/branches/clang_generic_atomicsxfxyjwf2014-09-182-2/+4
|\ \
| * | Expose generic atomicops on ClangRobert S. Edmonds2014-09-132-2/+4
* | | Merge pull request #20 from edmonds/branches/no_ppcxfxyjwf2014-09-181-3/+0
|\| |
| * | Remove GOOGLE_PROTOBUF_ARCH_PPCRobert S. Edmonds2014-09-131-3/+0
|/ /
* | Merge pull request #15 from google/pom_version_fixJisi Liu2014-09-041-1/+1
|\ \
| * | Bump version for maven-bundle-pluginJisi Liu2014-09-041-1/+1
|/ /
* | Merge pull request #12 from huahang/patch-2Jisi Liu2014-09-031-1/+1
|\ \
| * | remove a const qualifier in a method's return typehuahang2014-09-041-1/+1
|/ /
* | Merge pull request #8 from huahang/patch-1Jisi Liu2014-09-031-1/+1
|\ \
| * | fix a compile warninghuahang2014-09-031-1/+1
|/ /
* | Merge pull request #1 from dhirschfeld/vs2008-fixxfxyjwf2014-09-021-1/+1
|\ \