aboutsummaryrefslogtreecommitdiff
path: root/src/google/protobuf/wire_format_lite_inl.h
diff options
context:
space:
mode:
authorJisi Liu <jisi.liu@gmail.com>2015-08-25 16:32:01 -0700
committerJisi Liu <jisi.liu@gmail.com>2015-08-25 16:32:01 -0700
commit56c4f57bb0d3c76476947a99d6584df62b6d0805 (patch)
tree1e0a34fed1cc5ba6d51b72fdf742c2419a49ed84 /src/google/protobuf/wire_format_lite_inl.h
parentc3bc155aceda36ecb01cde2367a3b427f2d7ce40 (diff)
parent992531723cad417b4035d54dbca598d19868b69a (diff)
downloadprotobuf-56c4f57bb0d3c76476947a99d6584df62b6d0805.tar.gz
protobuf-56c4f57bb0d3c76476947a99d6584df62b6d0805.tar.bz2
protobuf-56c4f57bb0d3c76476947a99d6584df62b6d0805.zip
Merge branch 'gcc-c++11-fix' of https://github.com/nsuke/protobuf into beta-1
Manually merge pull request: https://github.com/google/protobuf/pull/674 that fixes the gcc C++11 build.
Diffstat (limited to 'src/google/protobuf/wire_format_lite_inl.h')
0 files changed, 0 insertions, 0 deletions