Merge branch 'master' into fix_death_test_child_mingw_wer_issue1116
Description
Description
Details
Details
- Committed
Tanzinul Islam <t_17_7@hotmail.com> Dec 31 2017, 01:55 - Pushed
• trottet Dec 4 2019, 13:52 - Parents
- R9484:4ba3803f936a: Merge branch 'master' into fix_death_test_child_mingw_wer_issue1116
R9484:5490beb0602e: Merge pull request #778 from gpakosz/C4389 - Branches
- Unknown
- Tags
Merged Changes
Merged Changes
| Commit | Author | Details | Committed | |||
|---|---|---|---|---|---|---|
| 5490beb0602e | Gennadiy Civil/GitHub | Merge pull request #778 from gpakosz/C4389 | Dec 22 2017 | |||
| 7990f56637d6 | Gregory Pakosz | Re-enable MSVC++ C4389 warning in CmdHelperEq() | Dec 21 2017 | |||
| 0062e4869f07 | Gennadiy Civil/GitHub | Merge pull request #1357 from bryanzim/master | Dec 20 2017 | |||
| e17907da8039 | bryanzim/GitHub | Update internal_utils.cmake | Dec 20 2017 | |||
| 773cc7876532 | bryanzim/GitHub | Merge branch 'master' into master | Dec 20 2017 | |||
| a37eedc3c15e | Gennadiy Civil/GitHub | Merge pull request #1248 from aninf-wo/hethi/issue-360-remove… | Dec 19 2017 | |||
| 782384d11ff4 | Gennadiy Civil/GitHub | Merge pull request #1212 from qzmfranklin/bazel | Dec 19 2017 | |||
| a7fceb4a98a7 | Gennadiy Civil/GitHub | Update gtest-param-test.h.pump | Dec 19 2017 | |||
| 8a48f0ed4e0f | Gennadiy Civil/GitHub | Update gtest-param-test.h.pump | Dec 19 2017 | |||
| 058b318bc703 | Gennadiy Civil/GitHub | Merge branch 'master' into hethi/issue-360-remove-GTEST_HAS_PARAM_TESTS | Dec 18 2017 | |||
| a7bd3725f08f | Gennadiy Civil/GitHub | Merge branch 'master' into bazel | Dec 18 2017 | |||
| 8cbda54f48bd | bryanzim/GitHub | Merge branch 'master' into master | Dec 15 2017 | |||
| 1865ecaf1779 | Gennadiy Civil/GitHub | Merge pull request #1354 from coryan/fix-top-level-license | Dec 15 2017 | |||
| f34cbefe5098 | Carlos O'Ryan | Merge branch 'fix-top-level-license' of github.com:coryan/googletest into fix… | Dec 12 2017 | |||
| 23a014ab5786 | Carlos O'Ryan | Refactor docs about contributions to CONTRIBUTING.md. | Dec 12 2017 | |||
| 4c8e288fcf15 | bryanzim/GitHub | Merge branch 'master' into master | Dec 11 2017 | |||
| cb95f316c8f5 | Gennadiy Civil/GitHub | Merge branch 'master' into fix-top-level-license | Dec 11 2017 | |||
| 0fe96607d85c | Gennadiy Civil/GitHub | Merge pull request #1355 from coryan/blaze-build-travis | Dec 11 2017 | |||
| 74a53063133b | Bryan Zimmerman | remove extra line | Dec 11 2017 | |||
| 3ea06317cd8b | Bryan Zimmerman | remove implicit casts | Dec 11 2017 | |||
| ed811dc79feb | Gennadiy Civil/GitHub | Merge branch 'master' into blaze-build-travis | Dec 11 2017 | |||
| f98c20baa82a | bryanzim/GitHub | Merge branch 'master' into master | Dec 11 2017 | |||
| 55fca1937d82 | Gennadiy Civil/GitHub | Merge branch 'master' into hethi/issue-360-remove-GTEST_HAS_PARAM_TESTS | Dec 9 2017 | |||
| 59202300f1a7 | Gennadiy Civil/GitHub | Merge pull request #1333 from sam-lunt/use-system-includes | Dec 9 2017 | |||
| c82cd5e41e37 | Carlos O'Ryan | Also add documentation around becoming a contributor. | Dec 9 2017 | |||
| 11841175d802 | Carlos O'Ryan | Wrong LICENSE file, sorry. Corrected. [skip ci] | Dec 9 2017 | |||
| bc3320b7f1da | Carlos O'Ryan | Implement bazel-based builds in Travis. | Dec 9 2017 | |||
| e22d344c51b4 | Carlos O'Ryan | Add Apache-2.0 LICENSE file. | Dec 8 2017 | |||
| 10ef1d9a1e7e | Gennadiy Civil/GitHub | Merge branch 'master' into use-system-includes | Dec 8 2017 | |||
| d6a4478caf10 | bryanzim/GitHub | Merge branch 'master' into master | Dec 8 2017 | |||
| cc372a071bb4 | Gennadiy Civil/GitHub | Merge pull request #1340 from coryan/fix-googlemock-test-build-file | Dec 8 2017 | |||
| cf3adad594b6 | Carlos O'Ryan/Carlos O'Ryan | Add licenses() directive for googlemock/tests. | Dec 8 2017 | |||
| 4aae1600d036 | bryanzim/GitHub | Merge branch 'master' into master | Dec 8 2017 | |||
| 4d1f930af878 | Gennadiy Civil/GitHub | Merge pull request #1345 from coryan/fix-travis-build-macOS | Dec 8 2017 | |||
| efc6abae678f | Gennadiy Civil/GitHub | Merge branch 'master' into fix-travis-build-macOS | Dec 8 2017 | |||
| 887a6c642006 | Gennadiy Civil/GitHub | Merge pull request #1348 from wmamrak/master | Dec 8 2017 | |||
| 57bb0bbbf80b | Wojciech Mamrak/GitHub | Remove C4996 warning in VS2017 | Dec 7 2017 | |||
| 3464f76e890a | Wojciech Mamrak/GitHub | Improved description of VS std::tuple support | Dec 7 2017 | |||
| 8d9d6bb0a375 | Wojciech Mamrak/GitHub | Improved description of VS std::tuple support | Dec 7 2017 | |||
| 4aa05bd4ffb8 | Carlos O'Ryan/Carlos O'Ryan | Only switch to g++-4.9 on Linux. | Dec 7 2017 | |||
| 11d21b7c2ab5 | bryanzim/GitHub | Merge branch 'master' into master | Dec 6 2017 | |||
| a868e618c060 | Gennadiy Civil/GitHub | Merge pull request #1225 from brian-peloton/master | Dec 5 2017 | |||
| 9e236748fb7c | Gennadiy Civil/GitHub | Merge branch 'master' into master | Dec 1 2017 | |||
| c5cba7d17a92 | Gennadiy Civil/GitHub | Merge branch 'master' into hethi/issue-360-remove-GTEST_HAS_PARAM_TESTS | Dec 1 2017 | |||
| ce919c3ddf80 | Gennadiy Civil/GitHub | Merge branch 'master' into use-system-includes | Dec 1 2017 | |||
| 247a3d8e5e5d | Gennadiy Civil/GitHub | Merge pull request #1324 from whame/master | Dec 1 2017 | |||
| f46bd00e369e | Sam Lunt/Sam Lunt | make includes system | Nov 28 2017 | |||
| a7269e24acaa | Bryan Zimmerman | replaced back accidently removed static_cast with consistent ImplicitCast_ | Nov 22 2017 | |||
| 49eb76df4718 | Gennadiy Civil/GitHub | Merge branch 'master' into hethi/issue-360-remove-GTEST_HAS_PARAM_TESTS | Nov 7 2017 | |||
| 82447f23be94 | whame | Fixes issue #826 by treating MinGW as "non-Windows" when determining colored… | Nov 7 2017 |