Commit Graph

  • 33d73d42b4 Added support for WINAPI_PARTITION_TV_TITLE which is defined on XboxOne gpetit 2017-08-14 12:42:23 -04:00
  • 7ebbf59834 Merge branch 'support_xboxone' of https://github.com/eidosmontreal/googletest into support_xboxone Gaspard Petit 2018-01-12 10:20:00 -05:00
  • 569d713a39 Added support for WINAPI_PARTITION_TV_TITLE which is defined on XboxOne gpetit 2017-08-14 12:42:23 -04:00
  • 93b77987f5 continue upstream/merge, etc Gennadiy Civil 2018-01-11 17:36:34 -05:00
  • 717d784ab2 Merge branch 'master' of https://github.com/google/googletest Gennadiy Civil 2018-01-11 17:17:59 -05:00
  • ed8d02cfc6
    Update .travis.yml Gennadiy Civil 2018-01-11 17:03:14 -05:00
  • 73d1251fe9
    Update .travis.yml Gennadiy Civil 2018-01-11 16:57:44 -05:00
  • cfd29e0488
    Update .travis.yml Gennadiy Civil 2018-01-11 16:55:21 -05:00
  • 29f94e0106
    Update .travis.yml Gennadiy Civil 2018-01-11 14:57:50 -05:00
  • 2982dc1a58 Trying to fix travis Gennadiy Civil 2018-01-11 14:57:20 -05:00
  • 13218917c8
    Merge pull request #1399 from gennadiycivil/master Gennadiy Civil 2018-01-11 14:26:47 -05:00
  • 5add34775c Merge branch 'master' of https://github.com/google/googletest Gennadiy Civil 2018-01-11 11:31:37 -05:00
  • 6914ae2394 Upstream cl 103120214 Gennadiy Civil 2018-01-11 11:31:23 -05:00
  • 836c419c0d
    Merge pull request #1398 from gennadiycivil/master Gennadiy Civil 2018-01-11 11:30:51 -05:00
  • 1d757db65c More merge, cleanup Gennadiy Civil 2018-01-10 16:49:20 -05:00
  • b44ed21905 Merge branch 'master' of https://github.com/google/googletest Gennadiy Civil 2018-01-10 16:46:21 -05:00
  • 481fe9446a More merge, cleanup Gennadiy Civil 2018-01-10 16:45:59 -05:00
  • cac5d7ce1a
    Merge pull request #1397 from gennadiycivil/master Gennadiy Civil 2018-01-10 16:09:23 -05:00
  • 84aa45941f Merge branch 'master' of https://github.com/google/googletest Gennadiy Civil 2018-01-10 14:42:37 -05:00
  • 6a26e47cfc Code merge, upstreaming accumulated changes, cleanup Gennadiy Civil 2018-01-10 14:42:29 -05:00
  • d7196896bb
    Merge pull request #1396 from gennadiycivil/master Gennadiy Civil 2018-01-10 14:35:21 -05:00
  • 62dbaa2947 revert Gennadiy Civil 2018-01-10 14:00:52 -05:00
  • d630a8bdac code merges, cleanup Gennadiy Civil 2018-01-10 13:58:00 -05:00
  • 6efe104aed
    Merge pull request #1395 from gennadiycivil/master Gennadiy Civil 2018-01-10 11:59:44 -05:00
  • f33902b97a revert googletest/test/gtest-param-test_test.cc Gennadiy Civil 2018-01-10 11:04:49 -05:00
  • f729a2867e Merge branch 'master' of github.com:gennadiycivil/googletest Gennadiy Civil 2018-01-10 10:57:37 -05:00
  • 8034001188 Merge branch 'master' of https://github.com/google/googletest Gennadiy Civil 2018-01-10 10:57:21 -05:00
  • 505de1d6e2
    Merge branch 'master' into master Gennadiy Civil 2018-01-10 10:42:25 -05:00
  • 6eccdb7b62
    Update .travis.yml Gennadiy Civil 2018-01-10 10:20:09 -05:00
  • 2f31bfab6b Merge branch 'master' of https://github.com/google/googletest Gennadiy Civil 2018-01-09 22:47:12 -05:00
  • d237297ceb code merge, cleanups Gennadiy Civil 2018-01-09 22:46:17 -05:00
  • 509e78be23
    Merge pull request #1394 from gennadiycivil/master Gennadiy Civil 2018-01-09 20:22:14 -05:00
  • 2ad5661db2 Upstream of cl 129104714 Gennadiy Civil 2018-01-09 16:41:15 -05:00
  • 5eecadf67a Revert one file Gennadiy Civil 2018-01-09 15:46:44 -05:00
  • 5d96565ccc Merge branch 'master' into support_xboxone Gaspard Petit 2018-01-09 15:22:30 -05:00
  • 9fce984a67 wip, cleanups/merge Gennadiy Civil 2018-01-09 14:48:06 -05:00
  • 2301524923
    Merge pull request #1393 from gennadiycivil/master Gennadiy Civil 2018-01-09 14:45:55 -05:00
  • 1df907381d
    Merge branch 'master' into master Gennadiy Civil 2018-01-09 14:00:25 -05:00
  • 258fd6e168 cleanup, merge Gennadiy Civil 2018-01-09 13:59:27 -05:00
  • 0e6da4cead
    Merge branch 'master' into fix-core-dump-shared Gennadiy Civil 2018-01-09 00:22:32 -05:00
  • e194f52114
    Merge pull request #1388 from rongjiecomputer/bazel Gennadiy Civil 2018-01-08 22:07:26 -05:00
  • cbd15d417e [Bazel] Detect Windows with cpu value x64_windows and x64_windows_msvc Loo Rong Jie 2018-01-07 22:52:52 +08:00
  • c3bb0ee2a6
    Merge pull request #1390 from gennadiycivil/master Gennadiy Civil 2018-01-08 17:10:16 -05:00
  • 91ba05cc36 Small cleanups, merge Gennadiy Civil 2018-01-08 16:14:06 -05:00
  • 3d27bdef53
    Merge pull request #1387 from coryan/optimize-build-matrix-ready Gennadiy Civil 2018-01-08 10:50:13 -05:00
  • 4371b996ed
    Merge pull request #1385 from gennadiycivil/master Gennadiy Civil 2018-01-06 00:02:40 -05:00
  • fab06101d7
    Merge branch 'master' into master Gennadiy Civil 2018-01-05 15:34:07 -05:00
  • 67d6e46728
    Use correct name for build event types. Carlos O'Ryan 2018-01-05 14:58:48 -05:00
  • 67476c1426 Revert one file for now Gennadiy Civil 2018-01-05 12:35:41 -05:00
  • adfdc65ca7
    Fixed test for pull request. Carlos O'Ryan 2018-01-05 11:01:37 -05:00
  • 5b26b0fce7
    Merge pull request #1007 from davidben/missing-declarations Gennadiy Civil 2018-01-05 10:18:26 -05:00
  • d3acb4ba18
    Fixed output and test for 'enabled_on_pr' Carlos O'Ryan 2018-01-05 09:32:50 -05:00
  • 6b4967a23a
    Merge branch 'master' into missing-declarations Gennadiy Civil 2018-01-04 22:01:38 -05:00
  • abbc0f8174
    Merge pull request #1377 from davidben/clang-cl Gennadiy Civil 2018-01-04 21:59:48 -05:00
  • 19b5774ccf code cleanup in preparation for merges, cl 180857299 Gennadiy Civil 2018-01-04 21:49:27 -05:00
  • 9cee677ce4
    Optimize build matrix (#1) Carlos O'Ryan 2018-01-04 13:04:31 -05:00
  • be6ee26a9b
    Merge pull request #1378 from gennadiycivil/master Gennadiy Civil 2018-01-04 12:17:46 -05:00
  • 4216f869f7
    Merge branch 'master' into master Gennadiy Civil 2018-01-04 10:13:00 -05:00
  • a5014476f0
    Merge pull request #1341 from coryan/fix-issue-776-support-autoconf-as-submodule Gennadiy Civil 2018-01-03 17:06:31 -05:00
  • 1c09831acc upstreaming cl 124976692 Gennadiy Civil 2018-01-03 16:57:05 -05:00
  • 1acf8c752e Also define GTEST_ATTRIBUTE_PRINTF_ in clang-cl. David Benjamin 2018-01-03 14:55:52 -05:00
  • b3d9be5c1d Pass the -Wmissing-declarations warning. David Benjamin 2017-02-10 19:19:54 -05:00
  • 26addade17
    Merge branch 'master' into fix-issue-776-support-autoconf-as-submodule Gennadiy Civil 2018-01-03 14:15:14 -05:00
  • ba6ecedede
    Merge pull request #1374 from davidben/tuple-msvc Gennadiy Civil 2018-01-03 14:11:38 -05:00
  • 88760a299f
    Merge pull request #991 from davidben/uintptr Gennadiy Civil 2018-01-03 14:10:29 -05:00
  • a3da63d97a
    Merge branch 'master' into tuple-msvc Gennadiy Civil 2018-01-03 13:04:37 -05:00
  • a9fa67cbe4
    Merge branch 'master' into fix-issue-776-support-autoconf-as-submodule Gennadiy Civil 2018-01-03 12:51:09 -05:00
  • 1414d71af0
    Merge pull request #1376 from gennadiycivil/master Samuel Benzaquen 2018-01-03 12:40:56 -05:00
  • e7734fb80c OSS Sync, cl 163329677 misterg 2018-01-02 14:42:09 -05:00
  • 90244a6aef Fix testing::Combine on MSVC 2017. David Benjamin 2018-01-02 12:55:44 -05:00
  • fa6730103e
    Merge branch 'master' into uintptr Gennadiy Civil 2018-01-02 10:54:26 -05:00
  • 1c2f190704
    Merge pull request #1109 from davidben/vs2017 Gennadiy Civil 2018-01-02 10:51:37 -05:00
  • 555e6e7948 Merge branch 'master' into fix_death_test_child_mingw_wer_issue1116 Tanzinul Islam 2017-12-31 00:55:13 +00:00
  • bcd35523cd Avoid warning C4619 in MSVC 2017. David Benjamin 2017-05-06 10:22:12 -04:00
  • ec2b0c3912
    Build both googletest and googlemock. Carlos O'Ryan 2017-12-24 12:22:46 -05:00
  • 75b85d5382
    Create a autotools-based build for Travis. Carlos O'Ryan 2017-12-24 10:34:56 -05:00
  • e76c3f837c
    Merge branch 'master' into fix-issue-776-support-autoconf-as-submodule Gennadiy Civil 2017-12-22 14:47:25 -05:00
  • 5490beb060
    Merge pull request #778 from gpakosz/C4389 Gennadiy Civil 2017-12-21 21:10:03 -05:00
  • 7990f56637 Re-enable MSVC++ C4389 warning in CmdHelperEq() Gregory Pakosz 2016-05-18 13:16:21 +02:00
  • 0062e4869f
    Merge pull request #1357 from bryanzim/master Gennadiy Civil 2017-12-20 15:57:28 -05:00
  • e17907da80
    Update internal_utils.cmake bryanzim 2017-12-20 10:06:20 -05:00
  • 773cc78765
    Merge branch 'master' into master bryanzim 2017-12-20 08:21:22 -05:00
  • b5b6a07d14
    Merge branch 'master' into fix-issue-776-support-autoconf-as-submodule Gennadiy Civil 2017-12-19 13:43:22 -05:00
  • a37eedc3c1
    Merge pull request #1248 from aninf-wo/hethi/issue-360-remove-GTEST_HAS_PARAM_TESTS Gennadiy Civil 2017-12-19 13:18:57 -05:00
  • 782384d11f
    Merge pull request #1212 from qzmfranklin/bazel Gennadiy Civil 2017-12-19 12:02:33 -05:00
  • a7fceb4a98
    Update gtest-param-test.h.pump Gennadiy Civil 2017-12-19 10:58:37 -05:00
  • 8a48f0ed4e
    Update gtest-param-test.h.pump Gennadiy Civil 2017-12-19 10:55:49 -05:00
  • 058b318bc7
    Merge branch 'master' into hethi/issue-360-remove-GTEST_HAS_PARAM_TESTS Gennadiy Civil 2017-12-18 12:02:12 -05:00
  • a7bd3725f0
    Merge branch 'master' into bazel Gennadiy Civil 2017-12-18 11:38:08 -05:00
  • 8cbda54f48
    Merge branch 'master' into master bryanzim 2017-12-15 16:52:50 -05:00
  • f6c44fe318
    Merge branch 'master' into fix-issue-776-support-autoconf-as-submodule Gennadiy Civil 2017-12-15 15:49:46 -05:00
  • 1865ecaf17
    Merge pull request #1354 from coryan/fix-top-level-license Gennadiy Civil 2017-12-15 15:49:18 -05:00
  • 3e2cb75446
    Merge branch 'master' into josh/fix_scoped_class2 Josh Bodily 2017-12-12 10:36:37 -07:00
  • f34cbefe50
    Merge branch 'fix-top-level-license' of github.com:coryan/googletest into fix-top-level-license Carlos O'Ryan 2017-12-11 19:34:19 -05:00
  • 23a014ab57
    Refactor docs about contributions to CONTRIBUTING.md. Carlos O'Ryan 2017-12-11 19:33:27 -05:00
  • 4c8e288fcf
    Merge branch 'master' into master bryanzim 2017-12-11 14:11:28 -05:00
  • cb95f316c8
    Merge branch 'master' into fix-top-level-license Gennadiy Civil 2017-12-11 13:13:07 -05:00
  • 0fe96607d8
    Merge pull request #1355 from coryan/blaze-build-travis Gennadiy Civil 2017-12-11 13:08:20 -05:00
  • 74a5306313 remove extra line Bryan Zimmerman 2017-12-11 12:21:35 -05:00
  • 3ea06317cd remove implicit casts Bryan Zimmerman 2017-12-11 12:19:56 -05:00