Commit 56c4f57b authored by Jisi Liu's avatar Jisi Liu
Browse files

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.
parents c3bc155a 99253172
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment