← Back to branch summary

~vcs-imports/protobuf/trunk

~vcs-imports/protobuf/trunk

Viewing all changes in revision 369.

Committer: jieluo at google
Date: 2014-08-25 20:17:53 UTC
Revision ID: svn-v4:630680e5-0e50-0410-840e-4b1c322b438d:trunk:601

merge tags/2.6.0 into trunk

files added:
python/google/protobuf/pyext/__init__.py

src/google/protobuf/stubs/atomicops_internals_generic_gcc.h

files modified:
CHANGES.txt

configure.ac

examples/list_people.cc

java/pom.xml

python/README.txt

python/google/protobuf/internal/reflection_test.py

python/setup.py

src/Makefile.am

src/google/protobuf/compiler/plugin.pb.h

src/google/protobuf/descriptor.pb.h

src/google/protobuf/stubs/atomicops.h

src/google/protobuf/stubs/common.h

src/google/protobuf/stubs/platform_macros.h

Show diffs side-by-side

added added

removed removed

examples/list_people.cc

python/README.txt

python/google/protobuf/internal/reflection_test.py

python/google/protobuf/pyext/__init__.py

python/setup.py

src/Makefile.am

src/google/protobuf/compiler/plugin.pb.h

src/google/protobuf/descriptor.pb.h

src/google/protobuf/stubs/atomicops.h

src/google/protobuf/stubs/atomicops_internals_generic_gcc.h

src/google/protobuf/stubs/common.h

src/google/protobuf/stubs/platform_macros.h

Older »