Merge branch 'variant_matcher' of https://github.com/zhangxy988/googletest into variant_matcher
Description
Description
Details
Details
- Committed
Xiaoyi Zhang <zhangxy988@gmail.com> Feb 27 2018, 22:06 - Pushed
• trottet Dec 4 2019, 13:52 - Parents
- R9484:576d689c19f0: Merge branch 'master' into variant_matcher
R9484:62be6f34d175: Merge branch 'variant_matcher' of https://github.com/zhangxy988/googletest into… - Branches
- Unknown
- Tags
Merged Changes
Merged Changes
| Commit | Author | Details | Committed | |||
|---|---|---|---|---|---|---|
| 576d689c19f0 | Xiaoyi Zhang/GitHub | Merge branch 'master' into variant_matcher | Feb 27 2018 | |||
| a9f2368dc07c | Gennadiy Civil/GitHub | Merge pull request #1483 from gennadiycivil/master | Feb 27 2018 | |||
| ba40fd145695 | Gennadiy Civil/GitHub | Merge branch 'master' into master | Feb 27 2018 | |||
| ce61dc54a20f | Gennadiy Civil/GitHub | Merge pull request #1423 from pcc/win-libcxx2 | Feb 27 2018 | |||
| 2bd1750ba7bd | Gennadiy Civil | gmock merging -2 | Feb 27 2018 | |||
| d4f77c1e3a34 | Gennadiy Civil/GitHub | Merge branch 'master' into win-libcxx2 | Feb 27 2018 | |||
| 3498a1ac52de | Peter Collingbourne | Use _CPPUNWIND instead of _HAS_EXCEPTIONS with MSVC. | Jan 25 2018 | |||
| f9155307911e | Peter Collingbourne | Pass -EHs-c- to disable exceptions with MSVC. | Jan 25 2018 |