Homec4science

Merge branch 'master' into fix_death_test_child_mingw_wer_issue1116

Authored by Tanzinul Islam <t_17_7@hotmail.com> on Dec 31 2017, 01:55.

Description

Merge branch 'master' into fix_death_test_child_mingw_wer_issue1116

Event Timeline

Tanzinul Islam <t_17_7@hotmail.com> committed R9484:555e6e794851: Merge branch 'master' into fix_death_test_child_mingw_wer_issue1116 (authored by Tanzinul Islam <t_17_7@hotmail.com>).Dec 31 2017, 01:55

Merged Changes

This commit merges a very large number of changes. Only the first 50 are shown.
CommitAuthorDetailsCommitted
5490beb0602eGennadiy Civil/GitHub
Merge pull request #778 from gpakosz/C4389 
Dec 22 2017
7990f56637d6Gregory Pakosz
Re-enable MSVC++ C4389 warning in CmdHelperEq() 
Dec 21 2017
0062e4869f07Gennadiy Civil/GitHub
Merge pull request #1357 from bryanzim/master 
Dec 20 2017
e17907da8039bryanzim/GitHub
Update internal_utils.cmake 
Dec 20 2017
773cc7876532bryanzim/GitHub
Merge branch 'master' into master 
Dec 20 2017
a37eedc3c15eGennadiy Civil/GitHub
Merge pull request #1248 from aninf-wo/hethi/issue-360-remove… 
Dec 19 2017
782384d11ff4Gennadiy Civil/GitHub
Merge pull request #1212 from qzmfranklin/bazel 
Dec 19 2017
a7fceb4a98a7Gennadiy Civil/GitHub
Update gtest-param-test.h.pump 
Dec 19 2017
8a48f0ed4e0fGennadiy Civil/GitHub
Update gtest-param-test.h.pump 
Dec 19 2017
058b318bc703Gennadiy Civil/GitHub
Merge branch 'master' into hethi/issue-360-remove-GTEST_HAS_PARAM_TESTS 
Dec 18 2017
a7bd3725f08fGennadiy Civil/GitHub
Merge branch 'master' into bazel 
Dec 18 2017
8cbda54f48bdbryanzim/GitHub
Merge branch 'master' into master 
Dec 15 2017
1865ecaf1779Gennadiy Civil/GitHub
Merge pull request #1354 from coryan/fix-top-level-license 
Dec 15 2017
f34cbefe5098Carlos O'Ryan
Merge branch 'fix-top-level-license' of github.com:coryan/googletest into fix… 
Dec 12 2017
23a014ab5786Carlos O'Ryan
Refactor docs about contributions to CONTRIBUTING.md. 
Dec 12 2017
4c8e288fcf15bryanzim/GitHub
Merge branch 'master' into master 
Dec 11 2017
cb95f316c8f5Gennadiy Civil/GitHub
Merge branch 'master' into fix-top-level-license 
Dec 11 2017
0fe96607d85cGennadiy Civil/GitHub
Merge pull request #1355 from coryan/blaze-build-travis 
Dec 11 2017
74a53063133bBryan Zimmerman
remove extra line 
Dec 11 2017
3ea06317cd8bBryan Zimmerman
remove implicit casts 
Dec 11 2017
ed811dc79febGennadiy Civil/GitHub
Merge branch 'master' into blaze-build-travis 
Dec 11 2017
f98c20baa82abryanzim/GitHub
Merge branch 'master' into master 
Dec 11 2017
55fca1937d82Gennadiy Civil/GitHub
Merge branch 'master' into hethi/issue-360-remove-GTEST_HAS_PARAM_TESTS 
Dec 9 2017
59202300f1a7Gennadiy Civil/GitHub
Merge pull request #1333 from sam-lunt/use-system-includes 
Dec 9 2017
c82cd5e41e37Carlos O'Ryan
Also add documentation around becoming a contributor. 
Dec 9 2017
11841175d802Carlos O'Ryan
Wrong LICENSE file, sorry. Corrected. [skip ci] 
Dec 9 2017
bc3320b7f1daCarlos O'Ryan
Implement bazel-based builds in Travis. 
Dec 9 2017
e22d344c51b4Carlos O'Ryan
Add Apache-2.0 LICENSE file. 
Dec 8 2017
10ef1d9a1e7eGennadiy Civil/GitHub
Merge branch 'master' into use-system-includes 
Dec 8 2017
d6a4478caf10bryanzim/GitHub
Merge branch 'master' into master 
Dec 8 2017
cc372a071bb4Gennadiy Civil/GitHub
Merge pull request #1340 from coryan/fix-googlemock-test-build-file 
Dec 8 2017
cf3adad594b6Carlos O'Ryan/Carlos O'Ryan
Add licenses() directive for googlemock/tests. 
Dec 8 2017
4aae1600d036bryanzim/GitHub
Merge branch 'master' into master 
Dec 8 2017
4d1f930af878Gennadiy Civil/GitHub
Merge pull request #1345 from coryan/fix-travis-build-macOS 
Dec 8 2017
efc6abae678fGennadiy Civil/GitHub
Merge branch 'master' into fix-travis-build-macOS 
Dec 8 2017
887a6c642006Gennadiy Civil/GitHub
Merge pull request #1348 from wmamrak/master 
Dec 8 2017
57bb0bbbf80bWojciech Mamrak/GitHub
Remove C4996 warning in VS2017 
Dec 7 2017
3464f76e890aWojciech Mamrak/GitHub
Improved description of VS std::tuple support 
Dec 7 2017
8d9d6bb0a375Wojciech Mamrak/GitHub
Improved description of VS std::tuple support 
Dec 7 2017
4aa05bd4ffb8Carlos O'Ryan/Carlos O'Ryan
Only switch to g++-4.9 on Linux. 
Dec 7 2017
11d21b7c2ab5bryanzim/GitHub
Merge branch 'master' into master 
Dec 6 2017
a868e618c060Gennadiy Civil/GitHub
Merge pull request #1225 from brian-peloton/master 
Dec 5 2017
9e236748fb7cGennadiy Civil/GitHub
Merge branch 'master' into master 
Dec 1 2017
c5cba7d17a92Gennadiy Civil/GitHub
Merge branch 'master' into hethi/issue-360-remove-GTEST_HAS_PARAM_TESTS 
Dec 1 2017
ce919c3ddf80Gennadiy Civil/GitHub
Merge branch 'master' into use-system-includes 
Dec 1 2017
247a3d8e5e5dGennadiy Civil/GitHub
Merge pull request #1324 from whame/master 
Dec 1 2017
f46bd00e369eSam Lunt/Sam Lunt
make includes system 
Nov 28 2017
a7269e24acaaBryan Zimmerman
replaced back accidently removed static_cast with consistent ImplicitCast_ 
Nov 22 2017
49eb76df4718Gennadiy Civil/GitHub
Merge branch 'master' into hethi/issue-360-remove-GTEST_HAS_PARAM_TESTS 
Nov 7 2017
82447f23be94whame
Fixes issue #826 by treating MinGW as "non-Windows" when determining colored… 
Nov 7 2017