Commit Graph

  • 97274b1e94
    Merge branch 'master' into fix-argc Gennadiy Civil 2018-08-19 14:03:30 -04:00
  • a946f7db03
    Merge branch 'master' into fix_death_test_child_mingw_wer_issue1116 Gennadiy Civil 2018-08-18 13:15:35 -04:00
  • d1c1aac781
    Merge pull request #1612 from wkaluza/fix-msvc-d9025-warning Gennadiy Civil 2018-08-17 23:27:19 -04:00
  • 85b572394b
    Merge pull request #1652 from medithe/patch-1 Gennadiy Civil 2018-08-17 23:05:00 -04:00
  • cb69e686df Merge branch 'fix_death_test_child_mingw_wer_issue1116' of https://github.com/tanzislam/googletest into fix_death_test_child_mingw_wer_issue1116 Tanzinul Islam 2018-08-18 00:00:41 +01:00
  • 9d77e63e12 Merge branch 'master' into fix_death_test_child_mingw_wer_issue1116 Tanzinul Islam 2018-08-17 23:58:45 +01:00
  • 2a380bc26d
    Merge branch 'master' into patch-1 Gennadiy Civil 2018-08-17 15:45:35 -04:00
  • e82d320567
    Merge pull request #1748 from laixer/std Gennadiy Civil 2018-08-17 15:44:11 -04:00
  • 0796415314 std references shouldn't be fully qualified Vadim Berezniker 2018-08-17 10:49:10 -07:00
  • cda442da0b
    Formatting Gennadiy Civil 2018-08-17 13:44:48 -04:00
  • edc1bc606e
    Merge branch 'master' into patch-1 Gennadiy Civil 2018-08-17 13:31:01 -04:00
  • 88cd66513c
    Minor formatting/style changes Gennadiy Civil 2018-08-17 13:25:52 -04:00
  • 687964c84f
    Merge branch 'master' into fix-argc Conor Burgess 2018-08-17 17:15:32 +01:00
  • a9bd428e72
    Merge branch 'master' into fix-msvc-d9025-warning Gennadiy Civil 2018-08-17 11:48:56 -04:00
  • 02a8ca8773
    Merge pull request #1546 from henryiii/cleanup-cmake Gennadiy Civil 2018-08-17 10:27:13 -04:00
  • a65a993a3c
    Merge branch 'master' into cleanup-cmake Henry Schreiner 2018-08-17 13:52:35 +02:00
  • f87798a3f7
    Merge pull request #1646 from tisi1988/master Gennadiy Civil 2018-08-16 15:28:20 -04:00
  • d20fa182a6
    was not quite right, Gennadiy Civil 2018-08-16 15:11:40 -04:00
  • b1bfdf0bf4
    Small formatting change Gennadiy Civil 2018-08-16 15:10:07 -04:00
  • 8c86040dd6
    Merge branch 'master' into master Gennadiy Civil 2018-08-16 13:37:53 -04:00
  • 8b34930c62
    Merge pull request #1142 from scottslacksmith/master Gennadiy Civil 2018-08-16 13:34:03 -04:00
  • c38f4b9f2c
    Small style changes. Gennadiy Civil 2018-08-16 13:18:13 -04:00
  • 21e518557a
    Merge branch 'master' into josh/fix_scoped_class2 Gennadiy Civil 2018-08-16 11:13:12 -04:00
  • f3a9fa6a62
    Merge branch 'master' into master Gennadiy Civil 2018-08-16 10:39:40 -04:00
  • 1dad4cf521
    Merge branch 'master' into fix_death_test_child_mingw_wer_issue1116 Gennadiy Civil 2018-08-16 10:35:56 -04:00
  • 490554aa0f
    Merge pull request #1746 from google/B60C9E9743233AA81897617B277709DF Gennadiy Civil 2018-08-15 19:24:13 -04:00
  • ca87cc72e2 googletest export Abseil Team 2018-08-15 16:38:42 -04:00
  • 1246e5807a
    Merge branch 'master' into cleanup-cmake Gennadiy Civil 2018-08-15 13:02:54 -07:00
  • 2172c08c92
    Merge pull request #1697 from morris-stock/ignore-cmake-generated-files Gennadiy Civil 2018-08-15 11:39:13 -07:00
  • 3c4f437c24
    Merge branch 'master' into master Gennadiy Civil 2018-08-15 11:33:15 -07:00
  • 06b9759288
    Merge branch 'master' into ignore-cmake-generated-files Gennadiy Civil 2018-08-15 10:17:09 -07:00
  • 7e7e3a6f45
    Merge branch 'master' into patch-1 Gennadiy Civil 2018-08-15 08:37:15 -07:00
  • 997d343dd6
    Merge pull request #1734 from eliasdaler/cmake-binary-dir-fix Gennadiy Civil 2018-08-15 08:26:25 -07:00
  • 02671abb44
    Merge branch 'master' into cmake-binary-dir-fix Gennadiy Civil 2018-08-14 14:25:05 -07:00
  • 587ceaeaee
    Merge pull request #1741 from gennadiycivil/master Gennadiy Civil 2018-08-14 14:24:01 -07:00
  • f0e4c411ca more comments changes Gennadiy Civil 2018-08-14 16:05:55 -04:00
  • e26771776b
    Merge branch 'master' into cmake-binary-dir-fix Gennadiy Civil 2018-08-14 12:55:13 -07:00
  • bbf738a2c1 more comments changes Gennadiy Civil 2018-08-14 15:45:00 -04:00
  • 265efde9a5 Comments changes, no functionality changes. Gennadiy Civil 2018-08-14 15:04:11 -04:00
  • 3306848f69
    Merge pull request #1740 from gennadiycivil/master Gennadiy Civil 2018-08-14 11:18:43 -07:00
  • a3c0dd0f4d Comments changes, no functionality changes Gennadiy Civil 2018-08-14 14:04:07 -04:00
  • 41fec55881
    Merge pull request #1665 from rongjiecomputer/deprecate Gennadiy Civil 2018-08-14 10:48:11 -07:00
  • 2421eff9f7
    Merge branch 'master' into deprecate Gennadiy Civil 2018-08-14 08:47:13 -07:00
  • 17714d65e1
    Merge pull request #1738 from gennadiycivil/master Gennadiy Civil 2018-08-14 08:21:59 -07:00
  • f225735222 Code formatting changes, clean up, no functionality changes Gennadiy Civil 2018-08-14 11:08:35 -04:00
  • 15ef6ec064
    Merge pull request #1733 from gennadiycivil/master Gennadiy Civil 2018-08-14 07:55:28 -07:00
  • caeaef302d
    Merge branch 'master' into master Gennadiy Civil 2018-08-14 07:42:41 -07:00
  • 87a37c60e3
    Merge branch 'master' into master tisi1988 2018-08-14 15:32:22 +02:00
  • c203bee245 formatting custom/README.md Gennadiy Civil 2018-08-13 22:45:53 -04:00
  • 9060e19c87 formatting for new READMEs Gennadiy Civil 2018-08-13 16:23:17 -04:00
  • 8bc11c040a
    Merge pull request #924 from wind-river-cdt/cross-testing-patch-1 Gennadiy Civil 2018-08-13 13:20:07 -07:00
  • 9ca399ae05 Change location of generated pkg-config files from CMAKE_BINARY_DIR to gmock/gtest_BINARY_DIR (#1717) Elias Daler 2018-08-13 23:01:00 +03:00
  • 47b57ff1b2
    Merge branch 'master' into cross-testing-patch-1 Gennadiy Civil 2018-08-13 11:38:32 -07:00
  • 44fb2a1edd Merge branch 'master' of https://github.com/google/googletest Gennadiy Civil 2018-08-13 14:32:06 -04:00
  • 63baab8924 Move instructions into custom/README files Gennadiy Civil 2018-08-13 14:31:56 -04:00
  • 7800ba3eea
    Merge pull request #1732 from gennadiycivil/master Gennadiy Civil 2018-08-13 10:18:11 -07:00
  • 18c940d13a comment cleanup Gennadiy Civil 2018-08-13 13:17:38 -04:00
  • 65b42fa615
    Merge pull request #1731 from 2power10/master Gennadiy Civil 2018-08-13 07:26:29 -07:00
  • ecc241900a - Fix the broken markdown table - Fix some format issue Yi Zheng 2018-08-13 17:57:51 +08:00
  • ae94a9097d
    Merge pull request #1727 from gennadiycivil/master Gennadiy Civil 2018-08-10 13:09:36 -07:00
  • 390a6b7932 Mode change on a python script Gennadiy Civil 2018-08-10 15:42:16 -04:00
  • 8cccb2a718
    Update README.md Gennadiy Civil 2018-08-10 15:20:51 -04:00
  • 9cb381952e
    Merge pull request #1726 from google/gennadiycivil-patch-2 Gennadiy Civil 2018-08-10 12:20:10 -07:00
  • b1236528fe
    Update README.md Gennadiy Civil 2018-08-10 12:05:17 -04:00
  • 77ac31c35f
    Update README.md Gennadiy Civil 2018-08-10 11:30:04 -04:00
  • 4de527dc2c
    Update README.md Gennadiy Civil 2018-08-10 11:29:18 -04:00
  • 945618b202
    Update README.md Gennadiy Civil 2018-08-10 11:06:52 -04:00
  • e821a2db23
    Update README.md Gennadiy Civil 2018-08-10 10:59:52 -04:00
  • 6b6be9457b
    Merge pull request #1725 from google/gennadiycivil-patch-1 Gennadiy Civil 2018-08-09 12:54:07 -07:00
  • 5eb263569b
    Update gmock_output_test.py Gennadiy Civil 2018-08-09 15:24:43 -04:00
  • b46b86ee60
    Merge pull request #1719 from happyCoder92/master Gennadiy Civil 2018-08-09 10:54:09 -07:00
  • 6b89cb06a7
    Merge pull request #1724 from gennadiycivil/master Gennadiy Civil 2018-08-09 10:53:58 -07:00
  • 4e13415ff4
    Merge branch 'master' into master Gennadiy Civil 2018-08-09 10:40:06 -07:00
  • 640556f9e5 Merge branch 'master' of https://github.com/google/googletest Gennadiy Civil 2018-08-09 13:37:27 -04:00
  • acaf5beacc formatting and small changes related to code management, no functionality changes Gennadiy Civil 2018-08-09 13:37:11 -04:00
  • 4843eafd9e
    Merge pull request #1723 from gennadiycivil/master Gennadiy Civil 2018-08-09 09:23:00 -07:00
  • 71c2bb4a97
    Merge branch 'master' into master Gennadiy Civil 2018-08-09 09:22:40 -07:00
  • 4d9411467d code management comments, [ci-skip], no functionality changes Gennadiy Civil 2018-08-09 12:21:49 -04:00
  • 33596cb5c3
    Merge pull request #1721 from gennadiycivil/master Gennadiy Civil 2018-08-09 09:11:18 -07:00
  • 7a79459a66 Fixing identation, causes build errors when warnings are treated as errors Gennadiy Civil 2018-08-09 11:55:48 -04:00
  • 54cb8b0238 Merge branch 'master' of github.com:gennadiycivil/googletest Gennadiy Civil 2018-08-09 11:54:12 -04:00
  • f7042937af Fixing identation, causes build errors when warnings are treated as errors Gennadiy Civil 2018-08-09 11:53:45 -04:00
  • d5b31df900
    Update gtest-death-test.cc Gennadiy Civil 2018-08-09 11:33:42 -04:00
  • 9faeadedf4 Merge branch 'master' of https://github.com/google/googletest Gennadiy Civil 2018-08-09 11:12:41 -04:00
  • ecc6944fb1 Fixing identation, causes build errors when warnings are treated as errors Gennadiy Civil 2018-08-09 11:12:12 -04:00
  • 2797ba8f91
    Merge pull request #1720 from gennadiycivil/master Gennadiy Civil 2018-08-09 07:53:26 -07:00
  • 3d167fde42 Merge branch 'master' of github.com:gennadiycivil/googletest Gennadiy Civil 2018-08-09 10:52:09 -04:00
  • 063a90b391 Formatting change for auto code management, no functionality changes Gennadiy Civil 2018-08-09 10:51:49 -04:00
  • 24786cb498
    Merge branch 'master' into deprecate Loo Rong Jie 2018-08-09 20:08:44 +08:00
  • db43df6df7 docs: fix broken links Wiktor Garbacz 2018-08-09 13:14:36 +02:00
  • efe27ac05c
    Merge branch 'master' into master tisi1988 2018-08-09 10:58:22 +02:00
  • 4de57ce787
    Merge pull request #1714 from gennadiycivil/master Gennadiy Civil 2018-08-08 12:47:02 -07:00
  • 541eeb4b40
    Merge branch 'master' into master Gennadiy Civil 2018-08-08 12:19:55 -07:00
  • 11f5a2740a
    Merge branch 'master' into cross-testing-patch-1 Gennadiy Civil 2018-08-08 12:19:04 -07:00
  • 00fc0d24d1 Formatting tweaks, no functionality changes Gennadiy Civil 2018-08-08 15:14:21 -04:00
  • 66bd580b5b
    Merge pull request #1713 from gennadiycivil/master Gennadiy Civil 2018-08-08 11:41:59 -07:00
  • 0eeb1afcac code management changes, no functionalty changes Gennadiy Civil 2018-08-08 14:41:21 -04:00
  • 61799bd500
    Merge pull request #1710 from gennadiycivil/master Gennadiy Civil 2018-08-08 10:34:21 -07:00
  • d31266e4ec Merge branch 'master' of github.com:gennadiycivil/googletest Gennadiy Civil 2018-08-08 13:22:10 -04:00
  • 35e1959125 Formatting Changes and small code merge Gennadiy Civil 2018-08-08 13:20:34 -04:00