Commit Graph

  • 26addade17
    Merge branch 'master' into fix-issue-776-support-autoconf-as-submodule Gennadiy Civil 2018-01-03 14:15:14 -0500
  • ba6ecedede
    Merge pull request #1374 from davidben/tuple-msvc Gennadiy Civil 2018-01-03 14:11:38 -0500
  • 88760a299f
    Merge pull request #991 from davidben/uintptr Gennadiy Civil 2018-01-03 14:10:29 -0500
  • a3da63d97a
    Merge branch 'master' into tuple-msvc Gennadiy Civil 2018-01-03 13:04:37 -0500
  • a9fa67cbe4
    Merge branch 'master' into fix-issue-776-support-autoconf-as-submodule Gennadiy Civil 2018-01-03 12:51:09 -0500
  • 1414d71af0
    Merge pull request #1376 from gennadiycivil/master Samuel Benzaquen 2018-01-03 12:40:56 -0500
  • e7734fb80c OSS Sync, cl 163329677 misterg 2018-01-02 14:42:09 -0500
  • 90244a6aef Fix testing::Combine on MSVC 2017. David Benjamin 2018-01-02 12:55:44 -0500
  • fa6730103e
    Merge branch 'master' into uintptr Gennadiy Civil 2018-01-02 10:54:26 -0500
  • 1c2f190704
    Merge pull request #1109 from davidben/vs2017 Gennadiy Civil 2018-01-02 10:51:37 -0500
  • 555e6e7948 Merge branch 'master' into fix_death_test_child_mingw_wer_issue1116 Tanzinul Islam 2017-12-31 00:55:13 +0000
  • bcd35523cd Avoid warning C4619 in MSVC 2017. David Benjamin 2017-05-06 10:22:12 -0400
  • ec2b0c3912
    Build both googletest and googlemock. Carlos O'Ryan 2017-12-24 12:22:46 -0500
  • 75b85d5382
    Create a autotools-based build for Travis. Carlos O'Ryan 2017-12-24 10:34:56 -0500
  • e76c3f837c
    Merge branch 'master' into fix-issue-776-support-autoconf-as-submodule Gennadiy Civil 2017-12-22 14:47:25 -0500
  • 5490beb060
    Merge pull request #778 from gpakosz/C4389 Gennadiy Civil 2017-12-21 21:10:03 -0500
  • 7990f56637 Re-enable MSVC++ C4389 warning in CmdHelperEq() Gregory Pakosz 2016-05-18 13:16:21 +0200
  • 0062e4869f
    Merge pull request #1357 from bryanzim/master Gennadiy Civil 2017-12-20 15:57:28 -0500
  • e17907da80
    Update internal_utils.cmake bryanzim 2017-12-20 10:06:20 -0500
  • 773cc78765
    Merge branch 'master' into master bryanzim 2017-12-20 08:21:22 -0500
  • b5b6a07d14
    Merge branch 'master' into fix-issue-776-support-autoconf-as-submodule Gennadiy Civil 2017-12-19 13:43:22 -0500
  • a37eedc3c1
    Merge pull request #1248 from aninf-wo/hethi/issue-360-remove-GTEST_HAS_PARAM_TESTS Gennadiy Civil 2017-12-19 13:18:57 -0500
  • 782384d11f
    Merge pull request #1212 from qzmfranklin/bazel Gennadiy Civil 2017-12-19 12:02:33 -0500
  • a7fceb4a98
    Update gtest-param-test.h.pump Gennadiy Civil 2017-12-19 10:58:37 -0500
  • 8a48f0ed4e
    Update gtest-param-test.h.pump Gennadiy Civil 2017-12-19 10:55:49 -0500
  • 058b318bc7
    Merge branch 'master' into hethi/issue-360-remove-GTEST_HAS_PARAM_TESTS Gennadiy Civil 2017-12-18 12:02:12 -0500
  • a7bd3725f0
    Merge branch 'master' into bazel Gennadiy Civil 2017-12-18 11:38:08 -0500
  • 8cbda54f48
    Merge branch 'master' into master bryanzim 2017-12-15 16:52:50 -0500
  • f6c44fe318
    Merge branch 'master' into fix-issue-776-support-autoconf-as-submodule Gennadiy Civil 2017-12-15 15:49:46 -0500
  • 1865ecaf17
    Merge pull request #1354 from coryan/fix-top-level-license Gennadiy Civil 2017-12-15 15:49:18 -0500
  • 3e2cb75446
    Merge branch 'master' into josh/fix_scoped_class2 Josh Bodily 2017-12-12 10:36:37 -0700
  • 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 -0500
  • 23a014ab57
    Refactor docs about contributions to CONTRIBUTING.md. Carlos O'Ryan 2017-12-11 19:33:27 -0500
  • 4c8e288fcf
    Merge branch 'master' into master bryanzim 2017-12-11 14:11:28 -0500
  • cb95f316c8
    Merge branch 'master' into fix-top-level-license Gennadiy Civil 2017-12-11 13:13:07 -0500
  • 0fe96607d8
    Merge pull request #1355 from coryan/blaze-build-travis Gennadiy Civil 2017-12-11 13:08:20 -0500
  • 74a5306313 remove extra line Bryan Zimmerman 2017-12-11 12:21:35 -0500
  • 3ea06317cd remove implicit casts Bryan Zimmerman 2017-12-11 12:19:56 -0500
  • ed811dc79f
    Merge branch 'master' into blaze-build-travis Gennadiy Civil 2017-12-11 10:48:12 -0500
  • f98c20baa8
    Merge branch 'master' into master bryanzim 2017-12-11 09:37:55 -0500
  • 55fca1937d
    Merge branch 'master' into hethi/issue-360-remove-GTEST_HAS_PARAM_TESTS Gennadiy Civil 2017-12-09 09:41:02 -0500
  • 59202300f1
    Merge pull request #1333 from sam-lunt/use-system-includes Gennadiy Civil 2017-12-09 09:38:16 -0500
  • c82cd5e41e
    Also add documentation around becoming a contributor. Carlos O'Ryan 2017-12-08 23:20:55 -0500
  • 11841175d8
    Wrong LICENSE file, sorry. Corrected. [skip ci] Carlos O'Ryan 2017-12-08 23:16:24 -0500
  • bc3320b7f1
    Implement bazel-based builds in Travis. Carlos O'Ryan 2017-12-08 20:59:07 -0500
  • e22d344c51
    Add Apache-2.0 LICENSE file. Carlos O'Ryan 2017-12-08 17:24:23 -0500
  • 10ef1d9a1e
    Merge branch 'master' into use-system-includes Gennadiy Civil 2017-12-08 15:11:13 -0500
  • d6a4478caf
    Merge branch 'master' into master bryanzim 2017-12-08 13:11:34 -0500
  • cc372a071b
    Merge pull request #1340 from coryan/fix-googlemock-test-build-file Gennadiy Civil 2017-12-08 13:03:20 -0500
  • cf3adad594
    Add licenses() directive for googlemock/tests. Carlos O'Ryan 2017-12-03 14:24:13 -0500
  • a30e15b144
    Merge branch 'master' into fix-issue-776-support-autoconf-as-submodule Gennadiy Civil 2017-12-08 11:56:41 -0500
  • 8f90d46c8c
    Merge branch 'master' into fix-argc Gennadiy Civil 2017-12-08 11:55:08 -0500
  • 4aae1600d0
    Merge branch 'master' into master bryanzim 2017-12-08 11:31:31 -0500
  • cdedd189b2
    Merge branch 'master' into fix-core-dump-shared Gennadiy Civil 2017-12-08 11:12:19 -0500
  • 4d1f930af8
    Merge pull request #1345 from coryan/fix-travis-build-macOS Gennadiy Civil 2017-12-08 11:09:01 -0500
  • efc6abae67
    Merge branch 'master' into fix-travis-build-macOS Gennadiy Civil 2017-12-08 11:08:54 -0500
  • 887a6c6420
    Merge pull request #1348 from wmamrak/master Gennadiy Civil 2017-12-08 11:08:17 -0500
  • 57bb0bbbf8
    Remove C4996 warning in VS2017 Wojciech Mamrak 2017-12-07 18:20:25 +0100
  • 3464f76e89
    Improved description of VS std::tuple support Wojciech Mamrak 2017-12-07 18:18:17 +0100
  • 8d9d6bb0a3
    Improved description of VS std::tuple support Wojciech Mamrak 2017-12-07 18:17:43 +0100
  • 4d50715c2b
    Fix location of _NSGetArgv correction. Conor Burgess 2017-12-07 11:49:33 +0000
  • ad383b274d
    Fix value pointed to by _NSGetArgc() on macOS Conor Burgess 2017-12-07 10:53:13 +0000
  • 4aa05bd4ff
    Only switch to g++-4.9 on Linux. Carlos O'Ryan 2017-12-06 15:33:27 -0500
  • 11d21b7c2a
    Merge branch 'master' into master bryanzim 2017-12-06 11:09:00 -0500
  • a868e618c0
    Merge pull request #1225 from brian-peloton/master Gennadiy Civil 2017-12-05 17:19:23 -0500
  • aea8580ecf
    Run autoconf from top-level directory. Carlos O'Ryan 2017-12-03 14:07:35 -0500
  • 0663ce9024 Fix double free when building Gtest/GMock in shared libraries and linking a test executable with both. Romain Geissler 2017-12-02 22:47:20 +0100
  • 9e236748fb
    Merge branch 'master' into master Gennadiy Civil 2017-12-01 16:41:53 -0500
  • c5cba7d17a
    Merge branch 'master' into hethi/issue-360-remove-GTEST_HAS_PARAM_TESTS Gennadiy Civil 2017-12-01 16:31:29 -0500
  • ce919c3ddf
    Merge branch 'master' into use-system-includes Gennadiy Civil 2017-12-01 16:29:28 -0500
  • 247a3d8e5e
    Merge pull request #1324 from whame/master Gennadiy Civil 2017-12-01 16:27:33 -0500
  • f46bd00e36 make includes system Sam Lunt 2017-11-27 17:07:56 -0600
  • 6c093a2391 Merge branch 'master' of https://github.com/google/googletest Scott Slack-Smith 2017-11-24 16:00:56 +0000
  • a7269e24ac replaced back accidently removed static_cast with consistent ImplicitCast_ Bryan Zimmerman 2017-11-22 09:40:48 -0500
  • 4ba3803f93
    Merge branch 'master' into fix_death_test_child_mingw_wer_issue1116 Tanzinul Islam 2017-11-19 20:17:46 +0000
  • 49eb76df47
    Merge branch 'master' into hethi/issue-360-remove-GTEST_HAS_PARAM_TESTS Gennadiy Civil 2017-11-07 10:32:23 -0800
  • 82447f23be Fixes issue #826 by treating MinGW as "non-Windows" when determining colored output whame 2017-11-07 15:22:50 +0100
  • 530885cbd5
    Merge branch 'master' into master bryanzim 2017-10-30 16:58:25 -0400
  • d175c8bf82
    Merge pull request #1313 from aninf-wo/heth/fix-faq-stars-issue-1312 Gennadiy Civil 2017-10-30 11:18:33 -0400
  • 43d6ad75bc
    Merge pull request #1308 from KindDragon/vs2017-ci Gennadiy Civil 2017-10-30 11:11:38 -0400
  • 8866af0386 remove markdown stars (bold) from code examples Herbert Thielen 2017-10-29 17:12:00 +0100
  • 1ae4096b9c fix for VS2017 deprecation of ::tr1::tuple change static_cast to ImplicitCast_ for consitency fixes for building with path names containing spaces Bryan Zimmerman 2017-10-27 14:01:16 -0400
  • b153bfd8f5 Enable CI for VS2017 Arkady Shapkin 2017-10-25 18:37:57 +0300
  • 3121b2049e Merge pull request #1304 from m-gupta/gtestapifix Gennadiy Civil 2017-10-25 15:57:21 -0400
  • e93a15c5a5 Merge pull request #913 from Romain-Geissler/fix-gcc-misleading-indentation-warning Gennadiy Civil 2017-10-25 13:51:48 -0400
  • 060783b7d2 Merge branch 'master' into gtestapifix m-gupta 2017-10-25 10:24:56 -0700
  • 20e2de7d8b Remove gcc 6 misleading indentations. Romain Geissler 2016-10-21 17:42:48 +0200
  • 7684db3271 Merge pull request #1218 from KindDragon/vs-build-fix Gennadiy Civil 2017-10-25 10:33:54 -0400
  • 840c711e7b Fix gmock tests when std::unary_function unavailable Arkady Shapkin 2017-06-08 02:28:17 +0300
  • 2641b021fc Fix tests with VS2015 and VS2017 Arkadiy Shapkin 2017-05-03 13:40:33 +0300
  • 77380cddf7 Enable C++11 features for VS2015 and VS2017 Arkadiy Shapkin 2017-05-03 13:30:11 +0300
  • 6d0bb75c81 Merge pull request #1139 from chehsunliu/master Gennadiy Civil 2017-10-24 11:27:04 -0400
  • 1beff241c3 googletest: Add GTEST_API_ attribute to ThreadLocal class. Manoj Gupta 2017-10-17 11:01:39 -0700
  • c208d8df23 Merge branch 'master' into master Gennadiy Civil 2017-10-20 17:25:41 -0400
  • 69e48e92de Merge pull request #1300 from gennadiycivil/master Gennadiy Civil 2017-10-18 16:24:59 -0400
  • 48986f9d4c Merge branch 'master' into master Gennadiy Civil 2017-10-18 16:22:29 -0400
  • 54c2648bff Workaround for Travis issue https://goo.gl/d5eV8o Gennadiy Civil 2017-10-18 16:18:47 -0400
  • 27be0dfb53 Merge pull request #1298 from google/revert-1297-master Gennadiy Civil 2017-10-18 10:42:49 -0400
  • 34aaf58c8b Revert "Workaround for Travis issue https://github.com/travis-ci/travis-ci/is…" Gennadiy Civil 2017-10-18 10:42:33 -0400
  • 5c9543547e Merge pull request #1297 from gennadiycivil/master Gennadiy Civil 2017-10-18 10:40:53 -0400