diff options
author | Jisi Liu <jisi.liu@gmail.com> | 2015-08-25 16:32:01 -0700 |
---|---|---|
committer | Jisi Liu <jisi.liu@gmail.com> | 2015-08-25 16:32:01 -0700 |
commit | 56c4f57bb0d3c76476947a99d6584df62b6d0805 (patch) | |
tree | 1e0a34fed1cc5ba6d51b72fdf742c2419a49ed84 /benchmarks | |
parent | c3bc155aceda36ecb01cde2367a3b427f2d7ce40 (diff) | |
parent | 992531723cad417b4035d54dbca598d19868b69a (diff) | |
download | protobuf-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 'benchmarks')
0 files changed, 0 insertions, 0 deletions