summaryrefslogtreecommitdiffstats
path: root/googletest
Commit message (Expand)AuthorAgeFilesLines
* more mergingrefs/pull/1415/headGennadiy Civil2018-01-222-6/+4
* mergingGennadiy Civil2018-01-221-2/+2
* code mergeGennadiy Civil2018-01-228-43/+44
* Merge branch 'master' into support_xboxonerefs/pull/1401/headGennadiy Civil2018-01-189-105/+375
|\
| * Adding python tests to Bazel build file. refs/pull/1412/headGennadiy Civil2018-01-181-1/+243
| * Use fully qualified in examplesrefs/pull/1407/headFedor Trushkin2018-01-181-2/+2
| * Document ScopedTrace utilityFedor Trushkin2018-01-181-7/+9
| * Expose ScopedTrace utility in public interfaceFedor Trushkin2018-01-176-70/+94
| * 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-152-53/+12
| * Test files for corresponding changesGennadiy Civil2018-01-151-0/+2
| * Test files for corresponding changesGennadiy Civil2018-01-151-6/+9
| * Test files for corresponding changesGennadiy Civil2018-01-151-5/+25
| * Test files for corresponding changesGennadiy Civil2018-01-151-0/+13
| * 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-122-1/+4
|/
* Upstream cl 103120214Gennadiy Civil2018-01-113-7/+33
* More merge, cleanuprefs/pull/1398/headGennadiy Civil2018-01-101-1/+1
* More merge, cleanupGennadiy Civil2018-01-102-8/+5
* 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-103-12/+71
* revert googletest/test/gtest-param-test_test.ccrefs/pull/1395/headGennadiy Civil2018-01-101-46/+3
* code merge, cleanupsGennadiy Civil2018-01-105-20/+59
* 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-093-5/+3
* Merge branch 'master' into masterrefs/pull/1393/headGennadiy Civil2018-01-091-3/+6
|\
| * [Bazel] Detect Windows with cpu value x64_windows and x64_windows_msvcrefs/pull/1388/headLoo Rong Jie2018-01-091-3/+6
* | cleanup, mergeGennadiy Civil2018-01-093-2/+4
|/
* Small cleanups, mergerefs/pull/1390/headGennadiy Civil2018-01-082-2/+5
* Merge branch 'master' into masterrefs/pull/1385/headGennadiy Civil2018-01-056-43/+51
|\
| * Merge branch 'master' into missing-declarationsrefs/pull/1007/headGennadiy Civil2018-01-0519-159/+71
| |\
| | * Merge pull request #1377 from davidben/clang-clGennadiy 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-035-42/+50
| | |/ | |/|
* | | Revert one file for nowGennadiy Civil2018-01-051-10/+0
* | | code cleanup in preparation for merges, cl 180857299Gennadiy Civil2018-01-0512-16/+19
| |/ |/|
* | Merge branch 'master' into masterrefs/pull/1378/headGennadiy Civil2018-01-041-30/+59
|\ \
| * \ Merge branch 'master' into fix-issue-776-support-autoconf-as-submodulerefs/pull/1341/headGennadiy Civil2018-01-032-8/+3
| |\ \ | | |/
| * | Merge branch 'master' into fix-issue-776-support-autoconf-as-submoduleGennadiy Civil2018-01-032-2/+10
| |\ \
| * \ \ Merge branch 'master' into fix-issue-776-support-autoconf-as-submoduleGennadiy Civil2017-12-222-10/+8
| |\ \ \
| * \ \ \ Merge branch 'master' into fix-issue-776-support-autoconf-as-submoduleGennadiy Civil2017-12-1916-112/+4
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' into fix-issue-776-support-autoconf-as-submoduleGennadiy Civil2017-12-154-168/+3
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into fix-issue-776-support-autoconf-as-submoduleGennadiy Civil2017-12-083-1/+9
| |\ \ \ \ \ \
| * | | | | | | Run autoconf from top-level directory.Carlos O'Ryan2017-12-031-30/+59