aboutsummaryrefslogtreecommitdiff
Commit message (Expand)AuthorAgeFilesLines
* Fix descriptor validation logic for packed enum fields.Feng Xiao2014-10-012-7/+34
* 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
|\
| * Added const qualifier to iterator to enable compiling with VS2008David Hirschfeld2014-08-271-1/+1
* | Rename README.txt to README.mdFeng Xiao2014-08-291-1/+1
* | Merge pull request #5 from google/fix_readmexfxyjwf2014-08-291-17/+20
|\ \
| * | Fix the formating of bold text.Feng Xiao2014-08-281-5/+5
| * | Update README.md to markdown format.Feng Xiao2014-08-281-12/+15
| * | Rename README.txt to README.mdFeng Xiao2014-08-281-0/+0
|/ /
* | Merge pull request #4 from google/fix_readmeJisi Liu2014-08-281-0/+12
|\ \ | |/ |/|
| * Add instructions on how to generate the configure script.Feng Xiao2014-08-281-0/+12
|/
* Rename COPYING.txt to LICENSE for opensource compliance and update linksFeng Xiao2014-08-263-3/+3
* merge 2.6.0 to trunkv2.6.0jieluo@google.com2014-08-252-8/+5
* merge tags/2.6.0 into trunkjieluo@google.com2014-08-2515-53/+238
* patch Issue 130740043 to trunk for other atomicops patches: [MIPS64] Add supp...jieluo@google.com2014-08-203-3/+134
* make dist complains the file name is too long and refuse to put it to tar. Ch...jieluo@google.com2014-08-143-2/+4
* Add deleted tests back for reflection_cpp2_test.py by addtional exception catchjieluo@google.com2014-08-141-0/+47
* change python README.txtjieluo@google.com2014-08-131-3/+8
* change Makefile.amjieluo@google.com2014-08-131-3/+4
* put python cpp tests into pyext/jieluo@google.com2014-08-135-34/+9
* add shared_pr.hjieluo@google.com2014-08-123-9/+480
* down integrate python opensource to svnjieluo@google.com2014-08-1266-968/+10128
* Change java descriptor back to privatejieluo@google.com2014-08-073-25/+5
* 1, Add comments for include<algorithm> we added for min/max on VS2013. 2, Add...jieluo@google.com2014-08-073-0/+4
* change java compiler to only produce one java filejieluo@google.com2014-08-076-27/+15
* use #undef instead of change the name of MemoryBarrierjieluo@google.com2014-08-0611-56/+57
* Cygwin doesn't work well if we try to capture stderr and stdout at the same t...jieluo@google.com2014-08-061-9/+18