summaryrefslogtreecommitdiffstats
path: root/googletest/include
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into support_xboxonerefs/pull/1401/headGennadiy Civil2018-01-183-72/+82
|\
| * Expose ScopedTrace utility in public interfaceFedor Trushkin2018-01-172-45/+53
| * Reverting some changes, need to make the merge compilerefs/pull/1402/headGennadiy Civil2018-01-151-1/+1
| * Reverting some changes, need to make the merge compileGennadiy Civil2018-01-151-2/+3
| * Reverting some changes, need to make the merge compileGennadiy Civil2018-01-151-1/+0
| * Reverting some changes, need to make the merge compileGennadiy Civil2018-01-151-4/+1
| * More code mergesGennadiy Civil2018-01-151-18/+15
| * Code mergingGennadiy Civil2018-01-152-8/+16
| * continue upstream/merge, etcrefs/pull/1400/headGennadiy Civil2018-01-111-4/+4
* | Added support for WINAPI_PARTITION_TV_TITLE which is defined on XboxOnegpetit2018-01-121-0/+3
|/
* Upstream cl 103120214Gennadiy Civil2018-01-112-4/+31
* More merge, cleanuprefs/pull/1398/headGennadiy Civil2018-01-101-1/+1
* More merge, cleanupGennadiy Civil2018-01-101-2/+1
* Code merge, upstreaming accumulated changes, cleanupGennadiy Civil2018-01-105-59/+62
* revertrefs/pull/1396/headGennadiy Civil2018-01-101-68/+9
* code merges, cleanupGennadiy Civil2018-01-102-11/+70
* code merge, cleanupsGennadiy Civil2018-01-101-1/+1
* Upstream of cl 129104714refs/pull/1394/headGennadiy Civil2018-01-092-49/+50
* Revert one fileGennadiy Civil2018-01-091-2/+3
* wip, cleanups/mergeGennadiy Civil2018-01-092-5/+3
* cleanup, mergeGennadiy Civil2018-01-093-2/+4
* Merge branch 'master' into missing-declarationsrefs/pull/1007/headGennadiy Civil2018-01-051-1/+1
|\
| * Also define GTEST_ATTRIBUTE_PRINTF_ in clang-cl.refs/pull/1377/headDavid Benjamin2018-01-031-1/+1
* | Pass the -Wmissing-declarations warning.David Benjamin2018-01-032-9/+9
|/
* Merge pull request #1374 from davidben/tuple-msvcGennadiy Civil2018-01-031-1/+1
|\
| * Fix testing::Combine on MSVC 2017.David Benjamin2018-01-021-1/+1
* | Merge branch 'master' into uintptrrefs/pull/991/headGennadiy Civil2018-01-0210-76/+76
|\ \ | |/
| * Avoid warning C4619 in MSVC 2017.refs/pull/1109/headDavid Benjamin2017-12-251-0/+4
| * Re-enable MSVC++ C4389 warning in CmdHelperEq()refs/pull/778/headGregory Pakosz2017-12-211-2/+0
| * Update gtest-param-test.h.pumprefs/pull/1248/headGennadiy Civil2017-12-191-3/+0
| * Update gtest-param-test.h.pumpGennadiy Civil2017-12-191-0/+3
| * Merge branch 'master' into hethi/issue-360-remove-GTEST_HAS_PARAM_TESTSGennadiy Civil2017-12-091-0/+3
| |\
| | * Remove C4996 warning in VS2017refs/pull/1348/headWojciech Mamrak2017-12-071-0/+3
| * | Merge branch 'master' into hethi/issue-360-remove-GTEST_HAS_PARAM_TESTSGennadiy Civil2017-11-071-5/+10
| |\ \ | | |/
| | * Merge branch 'master' into gtestapifixrefs/pull/1304/headm-gupta2017-10-251-3/+8
| | |\
| | | * Enable C++11 features for VS2015 and VS2017Arkadiy Shapkin2017-10-251-3/+8
| | * | googletest: Add GTEST_API_ attribute to ThreadLocal class.Manoj Gupta2017-10-201-2/+2
| | |/
| * | Merge branch 'master' into hethi/issue-360-remove-GTEST_HAS_PARAM_TESTSHerbert Thielen2017-10-041-1/+1
| |\ \ | | |/
| | * Use gender-neutral pronouns in comments and docsrefs/pull/1275/headJonathan Wakely2017-09-271-1/+1
| * | Merge branch 'master' into hethi/issue-360-remove-GTEST_HAS_PARAM_TESTSHerbert Thielen2017-09-242-5/+2
| |\ \ | | |/
| | * Merge branch 'master' into masterrefs/pull/1249/headGennadiy Civil2017-09-231-4/+0
| | |\
| | | * Revert "Allow macros inside of parametrized test names."refs/pull/1271/headGennadiy Civil2017-09-212-15/+9
| | | * Merge pull request #1245 from sheepmaster/2017_09_04_parametrizedGennadiy Civil2017-09-212-9/+15
| | | |\
| | | | * Allow macros inside of parametrized test names.Bernhard Bauer2017-09-042-9/+15
| | | * | Remove redundant declarationrefs/pull/1265/headBenjamin Kircher2017-09-161-4/+0
| | | |/
| | * | Swap reinterpret_cast for static_caststkhapugin@chromium.org2017-09-191-2/+2
| | * | add a castStepan Khapugin2017-09-051-1/+2
| | |/
| * | remove GTEST_HAS_PARAM_TESTSHerbert Thielen2017-09-047-50/+4
| |/
| * Detect Fuchsia, and set GTEST_HAS_PTHREAD on GTEST_OS_FUCHSIAScott Graham2017-08-292-2/+6
| * Merge branch 'master' into masterDaniel Krügler2017-08-211-3/+4
| |\