| Commit message (Expand) | Author | Age | Files | Lines |
* | Merge branch 'master' into support_xboxonerefs/pull/1401/head | Gennadiy Civil | 2018-01-18 | 3 | -72/+82 |
|\ |
|
| * | Expose ScopedTrace utility in public interface | Fedor Trushkin | 2018-01-17 | 2 | -45/+53 |
|
|
| * | Reverting some changes, need to make the merge compilerefs/pull/1402/head | Gennadiy Civil | 2018-01-15 | 1 | -1/+1 |
|
|
| * | Reverting some changes, need to make the merge compile | Gennadiy Civil | 2018-01-15 | 1 | -2/+3 |
|
|
| * | Reverting some changes, need to make the merge compile | Gennadiy Civil | 2018-01-15 | 1 | -1/+0 |
|
|
| * | Reverting some changes, need to make the merge compile | Gennadiy Civil | 2018-01-15 | 1 | -4/+1 |
|
|
| * | More code merges | Gennadiy Civil | 2018-01-15 | 1 | -18/+15 |
|
|
| * | Code merging | Gennadiy Civil | 2018-01-15 | 2 | -8/+16 |
|
|
| * | continue upstream/merge, etcrefs/pull/1400/head | Gennadiy Civil | 2018-01-11 | 1 | -4/+4 |
|
|
* | | Added support for WINAPI_PARTITION_TV_TITLE which is defined on XboxOne | gpetit | 2018-01-12 | 1 | -0/+3 |
|/ |
|
* | Upstream cl 103120214 | Gennadiy Civil | 2018-01-11 | 2 | -4/+31 |
|
|
* | More merge, cleanuprefs/pull/1398/head | Gennadiy Civil | 2018-01-10 | 1 | -1/+1 |
|
|
* | More merge, cleanup | Gennadiy Civil | 2018-01-10 | 1 | -2/+1 |
|
|
* | Code merge, upstreaming accumulated changes, cleanup | Gennadiy Civil | 2018-01-10 | 5 | -59/+62 |
|
|
* | revertrefs/pull/1396/head | Gennadiy Civil | 2018-01-10 | 1 | -68/+9 |
|
|
* | code merges, cleanup | Gennadiy Civil | 2018-01-10 | 2 | -11/+70 |
|
|
* | code merge, cleanups | Gennadiy Civil | 2018-01-10 | 1 | -1/+1 |
|
|
* | Upstream of cl 129104714refs/pull/1394/head | Gennadiy Civil | 2018-01-09 | 2 | -49/+50 |
|
|
* | Revert one file | Gennadiy Civil | 2018-01-09 | 1 | -2/+3 |
|
|
* | wip, cleanups/merge | Gennadiy Civil | 2018-01-09 | 2 | -5/+3 |
|
|
* | cleanup, merge | Gennadiy Civil | 2018-01-09 | 3 | -2/+4 |
|
|
* | Merge branch 'master' into missing-declarationsrefs/pull/1007/head | Gennadiy Civil | 2018-01-05 | 1 | -1/+1 |
|\ |
|
| * | Also define GTEST_ATTRIBUTE_PRINTF_ in clang-cl.refs/pull/1377/head | David Benjamin | 2018-01-03 | 1 | -1/+1 |
|
|
* | | Pass the -Wmissing-declarations warning. | David Benjamin | 2018-01-03 | 2 | -9/+9 |
|/ |
|
* | Merge pull request #1374 from davidben/tuple-msvc | Gennadiy Civil | 2018-01-03 | 1 | -1/+1 |
|\ |
|
| * | Fix testing::Combine on MSVC 2017. | David Benjamin | 2018-01-02 | 1 | -1/+1 |
|
|
* | | Merge branch 'master' into uintptrrefs/pull/991/head | Gennadiy Civil | 2018-01-02 | 10 | -76/+76 |
|\ \
| |/ |
|
| * | Avoid warning C4619 in MSVC 2017.refs/pull/1109/head | David Benjamin | 2017-12-25 | 1 | -0/+4 |
|
|
| * | Re-enable MSVC++ C4389 warning in CmdHelperEq()refs/pull/778/head | Gregory Pakosz | 2017-12-21 | 1 | -2/+0 |
|
|
| * | Update gtest-param-test.h.pumprefs/pull/1248/head | Gennadiy Civil | 2017-12-19 | 1 | -3/+0 |
|
|
| * | Update gtest-param-test.h.pump | Gennadiy Civil | 2017-12-19 | 1 | -0/+3 |
|
|
| * | Merge branch 'master' into hethi/issue-360-remove-GTEST_HAS_PARAM_TESTS | Gennadiy Civil | 2017-12-09 | 1 | -0/+3 |
| |\ |
|
| | * | Remove C4996 warning in VS2017refs/pull/1348/head | Wojciech Mamrak | 2017-12-07 | 1 | -0/+3 |
|
|
| * | | Merge branch 'master' into hethi/issue-360-remove-GTEST_HAS_PARAM_TESTS | Gennadiy Civil | 2017-11-07 | 1 | -5/+10 |
| |\ \
| | |/ |
|
| | * | Merge branch 'master' into gtestapifixrefs/pull/1304/head | m-gupta | 2017-10-25 | 1 | -3/+8 |
| | |\ |
|
| | | * | Enable C++11 features for VS2015 and VS2017 | Arkadiy Shapkin | 2017-10-25 | 1 | -3/+8 |
|
|
| | * | | googletest: Add GTEST_API_ attribute to ThreadLocal class. | Manoj Gupta | 2017-10-20 | 1 | -2/+2 |
| | |/ |
|
| * | | Merge branch 'master' into hethi/issue-360-remove-GTEST_HAS_PARAM_TESTS | Herbert Thielen | 2017-10-04 | 1 | -1/+1 |
| |\ \
| | |/ |
|
| | * | Use gender-neutral pronouns in comments and docsrefs/pull/1275/head | Jonathan Wakely | 2017-09-27 | 1 | -1/+1 |
|
|
| * | | Merge branch 'master' into hethi/issue-360-remove-GTEST_HAS_PARAM_TESTS | Herbert Thielen | 2017-09-24 | 2 | -5/+2 |
| |\ \
| | |/ |
|
| | * | Merge branch 'master' into masterrefs/pull/1249/head | Gennadiy Civil | 2017-09-23 | 1 | -4/+0 |
| | |\ |
|
| | | * | Revert "Allow macros inside of parametrized test names."refs/pull/1271/head | Gennadiy Civil | 2017-09-21 | 2 | -15/+9 |
|
|
| | | * | Merge pull request #1245 from sheepmaster/2017_09_04_parametrized | Gennadiy Civil | 2017-09-21 | 2 | -9/+15 |
| | | |\ |
|
| | | | * | Allow macros inside of parametrized test names. | Bernhard Bauer | 2017-09-04 | 2 | -9/+15 |
|
|
| | | * | | Remove redundant declarationrefs/pull/1265/head | Benjamin Kircher | 2017-09-16 | 1 | -4/+0 |
| | | |/ |
|
| | * | | Swap reinterpret_cast for static_cast | stkhapugin@chromium.org | 2017-09-19 | 1 | -2/+2 |
|
|
| | * | | add a cast | Stepan Khapugin | 2017-09-05 | 1 | -1/+2 |
| | |/ |
|
| * | | remove GTEST_HAS_PARAM_TESTS | Herbert Thielen | 2017-09-04 | 7 | -50/+4 |
| |/ |
|
| * | Detect Fuchsia, and set GTEST_HAS_PTHREAD on GTEST_OS_FUCHSIA | Scott Graham | 2017-08-29 | 2 | -2/+6 |
|
|
| * | Merge branch 'master' into master | Daniel Krügler | 2017-08-21 | 1 | -3/+4 |
| |\ |
|