Commit Graph

  • 3c5e064ca0
    Merge pull request #1417 from gennadiycivil/master Gennadiy Civil 2018-01-23 12:32:00 -0500
  • 58df576056 Merge branch 'master' of https://github.com/google/googletest Gennadiy Civil 2018-01-23 10:16:38 -0500
  • 6723b6c588 Merging, upstream http://cl/182836545 Gennadiy Civil 2018-01-23 10:15:28 -0500
  • bbb17ad0f7 more code merge Gennadiy Civil 2018-01-22 15:28:55 -0500
  • f1c87ad9f5 merges, cl/155419551 and other Gennadiy Civil 2018-01-22 15:20:19 -0500
  • 83fa0cb17d
    Merge pull request #1415 from gennadiycivil/master Gennadiy Civil 2018-01-22 15:18:03 -0500
  • 9bc86661f8 more merging Gennadiy Civil 2018-01-22 14:43:51 -0500
  • a0435a54ce merging Gennadiy Civil 2018-01-22 14:14:05 -0500
  • 8d707dfe81 code merge Gennadiy Civil 2018-01-22 11:47:30 -0500
  • 62ba5d91d0
    Merge pull request #1401 from eidosmontreal/support_xboxone Gennadiy Civil 2018-01-19 11:59:36 -0500
  • 1489dc8daa
    Merge branch 'master' into support_xboxone Gennadiy Civil 2018-01-18 17:42:34 -0500
  • 20b53ad786
    Merge branch 'master' into win-libcxx Gennadiy Civil 2018-01-18 17:41:36 -0500
  • 051053054d
    Merge pull request #1412 from gennadiycivil/master Gennadiy Civil 2018-01-18 14:52:37 -0500
  • b1623e9144 Adding python tests to Bazel build file. Gennadiy Civil 2018-01-18 14:32:31 -0500
  • 8d733dc195
    Merge pull request #1407 from ted-xp/master Gennadiy Civil 2018-01-18 09:47:22 -0500
  • 8e862211a2 Use fully qualified in examples Fedor Trushkin 2018-01-18 10:38:25 +0100
  • 354fc8d8b1 Document ScopedTrace utility Fedor Trushkin 2018-01-18 10:34:05 +0100
  • ba99a04be2 Check whether _MSC_VER is defined when detecting presence of cxxabi.h under libc++. Peter Collingbourne 2018-01-11 19:36:25 -0800
  • 9c82e7745c Expose ScopedTrace utility in public interface Fedor Trushkin 2018-01-17 16:41:59 +0100
  • 1b077667bd
    Merge pull request #1402 from gennadiycivil/master Gennadiy Civil 2018-01-15 18:48:35 -0500
  • 08b323f717 Reverting some changes, need to make the merge compile Gennadiy Civil 2018-01-15 18:16:11 -0500
  • 9195571c69 Reverting some changes, need to make the merge compile Gennadiy Civil 2018-01-15 17:39:33 -0500
  • 6d04de7419 Reverting some changes, need to make the merge compile Gennadiy Civil 2018-01-15 17:36:45 -0500
  • b9e297838d Reverting some changes, need to make the merge compile Gennadiy Civil 2018-01-15 17:34:46 -0500
  • 304be8f009 Test files for corresponding changes Gennadiy Civil 2018-01-15 17:15:52 -0500
  • 6befe422f2 Test files for corresponding changes Gennadiy Civil 2018-01-15 16:59:57 -0500
  • f45c22c482 Test files for corresponding changes Gennadiy Civil 2018-01-15 16:56:17 -0500
  • 5f4ce9d884 Test files for corresponding changes Gennadiy Civil 2018-01-15 16:46:16 -0500
  • 26085d7675 Merge branch 'master' of github.com:gennadiycivil/googletest Gennadiy Civil 2018-01-15 16:23:37 -0500
  • d629744ec0 More code merges Gennadiy Civil 2018-01-15 16:23:23 -0500
  • 6c86598805 Merge branch 'master' of https://github.com/google/googletest Gennadiy Civil 2018-01-15 16:22:59 -0500
  • 822c6201d3
    Merge branch 'master' into master Gennadiy Civil 2018-01-15 16:07:45 -0500
  • da1f7fe1e7 Code merging Gennadiy Civil 2018-01-15 16:06:32 -0500
  • 051fe2fa05
    Merge pull request #1339 from Romain-Geissler/fix-core-dump-shared Gennadiy Civil 2018-01-15 15:37:20 -0500
  • f6887b5cb9
    Merge branch 'master' into fix-core-dump-shared Gennadiy Civil 2018-01-13 15:06:57 -0500
  • 63ded6c27a
    Merge pull request #1400 from gennadiycivil/master Gennadiy Civil 2018-01-12 21:47:26 -0500
  • 27bb844e5c
    Merge branch 'master' into fix-argc Conor Burgess 2018-01-12 16:00:39 +0000
  • ea8f6f0e69 Merge branch 'support_xboxone' of https://github.com/eidosmontreal/googletest into support_xboxone Gaspard Petit 2018-01-12 10:20:46 -0500
  • 33d73d42b4 Added support for WINAPI_PARTITION_TV_TITLE which is defined on XboxOne gpetit 2017-08-14 12:42:23 -0400
  • 7ebbf59834 Merge branch 'support_xboxone' of https://github.com/eidosmontreal/googletest into support_xboxone Gaspard Petit 2018-01-12 10:20:00 -0500
  • 569d713a39 Added support for WINAPI_PARTITION_TV_TITLE which is defined on XboxOne gpetit 2017-08-14 12:42:23 -0400
  • 93b77987f5 continue upstream/merge, etc Gennadiy Civil 2018-01-11 17:36:34 -0500
  • 717d784ab2 Merge branch 'master' of https://github.com/google/googletest Gennadiy Civil 2018-01-11 17:17:59 -0500
  • ed8d02cfc6
    Update .travis.yml Gennadiy Civil 2018-01-11 17:03:14 -0500
  • 73d1251fe9
    Update .travis.yml Gennadiy Civil 2018-01-11 16:57:44 -0500
  • cfd29e0488
    Update .travis.yml Gennadiy Civil 2018-01-11 16:55:21 -0500
  • 29f94e0106
    Update .travis.yml Gennadiy Civil 2018-01-11 14:57:50 -0500
  • 2982dc1a58 Trying to fix travis Gennadiy Civil 2018-01-11 14:57:20 -0500
  • 13218917c8
    Merge pull request #1399 from gennadiycivil/master Gennadiy Civil 2018-01-11 14:26:47 -0500
  • 5add34775c Merge branch 'master' of https://github.com/google/googletest Gennadiy Civil 2018-01-11 11:31:37 -0500
  • 6914ae2394 Upstream cl 103120214 Gennadiy Civil 2018-01-11 11:31:23 -0500
  • 836c419c0d
    Merge pull request #1398 from gennadiycivil/master Gennadiy Civil 2018-01-11 11:30:51 -0500
  • 1d757db65c More merge, cleanup Gennadiy Civil 2018-01-10 16:49:20 -0500
  • b44ed21905 Merge branch 'master' of https://github.com/google/googletest Gennadiy Civil 2018-01-10 16:46:21 -0500
  • 481fe9446a More merge, cleanup Gennadiy Civil 2018-01-10 16:45:59 -0500
  • cac5d7ce1a
    Merge pull request #1397 from gennadiycivil/master Gennadiy Civil 2018-01-10 16:09:23 -0500
  • 84aa45941f Merge branch 'master' of https://github.com/google/googletest Gennadiy Civil 2018-01-10 14:42:37 -0500
  • 6a26e47cfc Code merge, upstreaming accumulated changes, cleanup Gennadiy Civil 2018-01-10 14:42:29 -0500
  • d7196896bb
    Merge pull request #1396 from gennadiycivil/master Gennadiy Civil 2018-01-10 14:35:21 -0500
  • 62dbaa2947 revert Gennadiy Civil 2018-01-10 14:00:52 -0500
  • d630a8bdac code merges, cleanup Gennadiy Civil 2018-01-10 13:58:00 -0500
  • 6efe104aed
    Merge pull request #1395 from gennadiycivil/master Gennadiy Civil 2018-01-10 11:59:44 -0500
  • f33902b97a revert googletest/test/gtest-param-test_test.cc Gennadiy Civil 2018-01-10 11:04:49 -0500
  • f729a2867e Merge branch 'master' of github.com:gennadiycivil/googletest Gennadiy Civil 2018-01-10 10:57:37 -0500
  • 8034001188 Merge branch 'master' of https://github.com/google/googletest Gennadiy Civil 2018-01-10 10:57:21 -0500
  • 505de1d6e2
    Merge branch 'master' into master Gennadiy Civil 2018-01-10 10:42:25 -0500
  • 6eccdb7b62
    Update .travis.yml Gennadiy Civil 2018-01-10 10:20:09 -0500
  • 2f31bfab6b Merge branch 'master' of https://github.com/google/googletest Gennadiy Civil 2018-01-09 22:47:12 -0500
  • d237297ceb code merge, cleanups Gennadiy Civil 2018-01-09 22:46:17 -0500
  • 509e78be23
    Merge pull request #1394 from gennadiycivil/master Gennadiy Civil 2018-01-09 20:22:14 -0500
  • 2ad5661db2 Upstream of cl 129104714 Gennadiy Civil 2018-01-09 16:41:15 -0500
  • 5eecadf67a Revert one file Gennadiy Civil 2018-01-09 15:46:44 -0500
  • 5d96565ccc Merge branch 'master' into support_xboxone Gaspard Petit 2018-01-09 15:22:30 -0500
  • 9fce984a67 wip, cleanups/merge Gennadiy Civil 2018-01-09 14:48:06 -0500
  • 2301524923
    Merge pull request #1393 from gennadiycivil/master Gennadiy Civil 2018-01-09 14:45:55 -0500
  • 1df907381d
    Merge branch 'master' into master Gennadiy Civil 2018-01-09 14:00:25 -0500
  • 258fd6e168 cleanup, merge Gennadiy Civil 2018-01-09 13:59:27 -0500
  • 0e6da4cead
    Merge branch 'master' into fix-core-dump-shared Gennadiy Civil 2018-01-09 00:22:32 -0500
  • e194f52114
    Merge pull request #1388 from rongjiecomputer/bazel Gennadiy Civil 2018-01-08 22:07:26 -0500
  • cbd15d417e [Bazel] Detect Windows with cpu value x64_windows and x64_windows_msvc Loo Rong Jie 2018-01-07 22:52:52 +0800
  • c3bb0ee2a6
    Merge pull request #1390 from gennadiycivil/master Gennadiy Civil 2018-01-08 17:10:16 -0500
  • 91ba05cc36 Small cleanups, merge Gennadiy Civil 2018-01-08 16:14:06 -0500
  • 3d27bdef53
    Merge pull request #1387 from coryan/optimize-build-matrix-ready Gennadiy Civil 2018-01-08 10:50:13 -0500
  • 4371b996ed
    Merge pull request #1385 from gennadiycivil/master Gennadiy Civil 2018-01-06 00:02:40 -0500
  • fab06101d7
    Merge branch 'master' into master Gennadiy Civil 2018-01-05 15:34:07 -0500
  • 67d6e46728
    Use correct name for build event types. Carlos O'Ryan 2018-01-05 14:58:48 -0500
  • 67476c1426 Revert one file for now Gennadiy Civil 2018-01-05 12:35:41 -0500
  • adfdc65ca7
    Fixed test for pull request. Carlos O'Ryan 2018-01-05 11:01:37 -0500
  • 5b26b0fce7
    Merge pull request #1007 from davidben/missing-declarations Gennadiy Civil 2018-01-05 10:18:26 -0500
  • d3acb4ba18
    Fixed output and test for 'enabled_on_pr' Carlos O'Ryan 2018-01-05 09:32:50 -0500
  • 6b4967a23a
    Merge branch 'master' into missing-declarations Gennadiy Civil 2018-01-04 22:01:38 -0500
  • abbc0f8174
    Merge pull request #1377 from davidben/clang-cl Gennadiy Civil 2018-01-04 21:59:48 -0500
  • 19b5774ccf code cleanup in preparation for merges, cl 180857299 Gennadiy Civil 2018-01-04 21:49:27 -0500
  • 9cee677ce4
    Optimize build matrix (#1) Carlos O'Ryan 2018-01-04 13:04:31 -0500
  • be6ee26a9b
    Merge pull request #1378 from gennadiycivil/master Gennadiy Civil 2018-01-04 12:17:46 -0500
  • 4216f869f7
    Merge branch 'master' into master Gennadiy Civil 2018-01-04 10:13:00 -0500
  • a5014476f0
    Merge pull request #1341 from coryan/fix-issue-776-support-autoconf-as-submodule Gennadiy Civil 2018-01-03 17:06:31 -0500
  • 1c09831acc upstreaming cl 124976692 Gennadiy Civil 2018-01-03 16:57:05 -0500
  • 1acf8c752e Also define GTEST_ATTRIBUTE_PRINTF_ in clang-cl. David Benjamin 2018-01-03 14:55:52 -0500
  • b3d9be5c1d Pass the -Wmissing-declarations warning. David Benjamin 2017-02-10 19:19:54 -0500