Sign in
pigweed
/
third_party
/
github
/
protocolbuffers
/
protobuf
/
1eba9d9c7424235b1a6dcd866fcd06d12e08a7f3
commit
1eba9d9c7424235b1a6dcd866fcd06d12e08a7f3
[
log
]
[
tgz
]
author
jieluo@google.com <jieluo@google.com@630680e5-0e50-0410-840e-4b1c322b438d>
Mon Aug 25 20:17:53 2014 +0000
committer
jieluo@google.com <jieluo@google.com@630680e5-0e50-0410-840e-4b1c322b438d>
Mon Aug 25 20:17:53 2014 +0000
tree
b2a894794db1f6147214e356c20f754e270f4e7f
parent
786379af4766fa7ec22b51862ba6e84156b1f9cb
[
diff
]
merge tags/2.6.0 into trunk
CHANGES.txt
[
diff
]
configure.ac
[
diff
]
examples/list_people.cc
[
diff
]
java/pom.xml
[
diff
]
python/README.txt
[
diff
]
python/google/protobuf/internal/reflection_test.py
[
diff
]
python/google/protobuf/pyext/__init__.py
[Added -
diff
]
python/setup.py
[
diff
]
src/Makefile.am
[
diff
]
src/google/protobuf/compiler/plugin.pb.h
[
diff
]
src/google/protobuf/descriptor.pb.h
[
diff
]
src/google/protobuf/stubs/atomicops.h
[
diff
]
src/google/protobuf/stubs/atomicops_internals_generic_gcc.h
[Added -
diff
]
src/google/protobuf/stubs/common.h
[
diff
]
src/google/protobuf/stubs/platform_macros.h
[
diff
]
15 files changed
tree: b2a894794db1f6147214e356c20f754e270f4e7f
benchmarks/
editors/
examples/
java/
m4/
more_tests/
python/
src/
vsprojects/
autogen.sh
CHANGES.txt
configure.ac
CONTRIBUTORS.txt
COPYING.txt
generate_descriptor_proto.sh
INSTALL.txt
Makefile.am
post_process_dist.sh
protobuf-lite.pc.in
protobuf.pc.in
README.txt