Homec4science

Merge branch 'master' into support_xboxone

Authored by Gaspard Petit <gaspard.petit@eidosmontreal.com> on Jan 9 2018, 21:22.

Description

Merge branch 'master' into support_xboxone

Event Timeline

Gaspard Petit <gaspard.petit@eidosmontreal.com> committed R9484:5d96565ccc4b: Merge branch 'master' into support_xboxone (authored by Gaspard Petit <gaspard.petit@eidosmontreal.com>).Jan 9 2018, 21:22

Merged Changes

This commit merges a very large number of changes. Only the first 50 are shown.
CommitAuthorDetailsCommitted
23015249236eGennadiy Civil/GitHub
Merge pull request #1393 from gennadiycivil/master 
Jan 9 2018
1df907381de5Gennadiy Civil/GitHub
Merge branch 'master' into master 
Jan 9 2018
258fd6e16820Gennadiy Civil
cleanup, merge 
Jan 9 2018
e194f52114a1Gennadiy Civil/GitHub
Merge pull request #1388 from rongjiecomputer/bazel 
Jan 9 2018
cbd15d417e9aLoo Rong Jie
[Bazel] Detect Windows with cpu value x64_windows and x64_windows_msvc 
Jan 9 2018
c3bb0ee2a632Gennadiy Civil/GitHub
Merge pull request #1390 from gennadiycivil/master 
Jan 8 2018
91ba05cc360aGennadiy Civil
Small cleanups, merge 
Jan 8 2018
3d27bdef53a5Gennadiy Civil/GitHub
Merge pull request #1387 from coryan/optimize-build-matrix-ready 
Jan 8 2018
4371b996edb2Gennadiy Civil/GitHub
Merge pull request #1385 from gennadiycivil/master 
Jan 6 2018
fab06101d709Gennadiy Civil/GitHub
Merge branch 'master' into master 
Jan 5 2018
67d6e467285dCarlos O'Ryan
Use correct name for build event types. 
Jan 5 2018
67476c1426dcGennadiy Civil
Revert one file for now 
Jan 5 2018
adfdc65ca7edCarlos O'Ryan
Fixed test for pull request. 
Jan 5 2018
5b26b0fce73eGennadiy Civil/GitHub
Merge pull request #1007 from davidben/missing-declarations 
Jan 5 2018
d3acb4ba18a5Carlos O'Ryan
Fixed output and test for 'enabled_on_pr' 
Jan 5 2018
6b4967a23aaeGennadiy Civil/GitHub
Merge branch 'master' into missing-declarations 
Jan 5 2018
abbc0f8174d9Gennadiy Civil/GitHub
Merge pull request #1377 from davidben/clang-cl 
Jan 5 2018
19b5774ccf6cGennadiy Civil
code cleanup in preparation for merges, cl 180857299 
Jan 5 2018
9cee677ce40dCarlos O'Ryan/GitHub
Optimize build matrix (#1) 
Jan 4 2018
be6ee26a9b5bGennadiy Civil/GitHub
Merge pull request #1378 from gennadiycivil/master 
Jan 4 2018
4216f869f77bGennadiy Civil/GitHub
Merge branch 'master' into master 
Jan 4 2018
a5014476f0c4Gennadiy Civil/GitHub
Merge pull request #1341 from coryan/fix-issue-776-support-autoconf-as-submodule 
Jan 3 2018
1c09831acc69Gennadiy Civil
upstreaming cl 124976692 
Jan 3 2018
1acf8c752ee8David Benjamin
Also define GTEST_ATTRIBUTE_PRINTF_ in clang-cl. 
Jan 3 2018
b3d9be5c1d96David Benjamin
Pass the -Wmissing-declarations warning. 
Jan 3 2018
26addade175bGennadiy Civil/GitHub
Merge branch 'master' into fix-issue-776-support-autoconf-as-submodule 
Jan 3 2018
ba6ecedede74Gennadiy Civil/GitHub
Merge pull request #1374 from davidben/tuple-msvc 
Jan 3 2018
88760a299f56Gennadiy Civil/GitHub
Merge pull request #991 from davidben/uintptr 
Jan 3 2018
a3da63d97aceGennadiy Civil/GitHub
Merge branch 'master' into tuple-msvc 
Jan 3 2018
a9fa67cbe495Gennadiy Civil/GitHub
Merge branch 'master' into fix-issue-776-support-autoconf-as-submodule 
Jan 3 2018
1414d71af0c0Samuel Benzaquen/GitHub
Merge pull request #1376 from gennadiycivil/master 
Jan 3 2018
e7734fb80cacmisterg
OSS Sync, cl 163329677 
Jan 2 2018
90244a6aef73David Benjamin
Fix testing::Combine on MSVC 2017. 
Jan 2 2018
fa6730103ecaGennadiy Civil/GitHub
Merge branch 'master' into uintptr 
Jan 2 2018
1c2f19070472Gennadiy Civil/GitHub
Merge pull request #1109 from davidben/vs2017 
Jan 2 2018
bcd35523cd7cDavid Benjamin
Avoid warning C4619 in MSVC 2017. 
Dec 25 2017
ec2b0c391261Carlos O'Ryan
Build both googletest and googlemock. 
Dec 24 2017
75b85d538295Carlos O'Ryan
Create a autotools-based build for Travis. 
Dec 24 2017
e76c3f837c83Gennadiy Civil/GitHub
Merge branch 'master' into fix-issue-776-support-autoconf-as-submodule 
Dec 22 2017
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
b5b6a07d1422Gennadiy Civil/GitHub
Merge branch 'master' into fix-issue-776-support-autoconf-as-submodule 
Dec 19 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