Commit Graph

  • a2dd136578 merging port, cont. 191443078 Gennadiy Civil 2018-04-03 11:38:30 -0400
  • 1065591bdb Merge branch 'master' of github.com:google/googletest Gennadiy Civil 2018-04-03 11:24:45 -0400
  • aa349acb07 merging, cont - 2 Gennadiy Civil 2018-04-03 11:23:54 -0400
  • 6c9d07f112
    Merge pull request #1538 from gennadiycivil/master Gennadiy Civil 2018-04-03 11:18:56 -0400
  • 6abaa2467b Merge branch 'master' of github.com:google/googletest Gennadiy Civil 2018-04-03 11:06:34 -0400
  • 2cedd5b9c1 merging gtest-port.h , 191439094 Gennadiy Civil 2018-04-03 11:06:20 -0400
  • 653a435f99
    Merge pull request #1537 from gennadiycivil/master Gennadiy Civil 2018-04-03 10:09:08 -0400
  • 04d1e56bd2 merging, just comments format Gennadiy Civil 2018-04-03 09:56:23 -0400
  • 5beb452bbe testing, merge Gennadiy Civil 2018-04-03 09:45:49 -0400
  • b8cbd53e02 Merge branch 'master' of github.com:google/googletest Gennadiy Civil 2018-04-03 09:31:49 -0400
  • df5a48da03 Testing, gtest-port.h merge Gennadiy Civil 2018-04-03 09:31:10 -0400
  • 9df719da8d
    Merge pull request #1534 from gennadiycivil/master Gennadiy Civil 2018-04-02 16:03:22 -0400
  • 87a4cdddd0 merging gtest-port.h, again - 1 Gennadiy Civil 2018-04-02 14:22:24 -0400
  • 5c7c365d5f Merge branch 'master' into fix_death_test_child_mingw_wer_issue1116 Tanzinul Islam 2018-04-01 13:43:57 +0100
  • b1d18b85bd
    Merge branch 'master' into int3 Roland Leißa 2018-03-30 03:16:20 +0200
  • 7888184f28
    Include OSX builds back into PR builds Gennadiy Civil 2018-03-29 13:50:32 -0400
  • 86d14079be
    Merge pull request #1527 from google/revert-1518-master Gennadiy Civil 2018-03-29 13:28:47 -0400
  • b2373c6f51
    Revert "merging gtest-port 1 of N" Gennadiy Civil 2018-03-29 13:28:29 -0400
  • 527fd38867
    Merge pull request #1526 from google/revert-1525-master Gennadiy Civil 2018-03-29 13:28:04 -0400
  • 54bb165ffd
    Revert "merging gtest-port, 2" Gennadiy Civil 2018-03-29 13:27:11 -0400
  • e10ea42274 Merge remote-tracking branch 'google/master' into int3 Roland Leißa 2018-03-29 16:39:40 +0200
  • d04bf07fad typo Roland Leißa 2018-03-29 16:38:23 +0200
  • 09a0e17c6a
    Merge pull request #1525 from gennadiycivil/master Gennadiy Civil 2018-03-29 10:24:19 -0400
  • 8e0364a37b merging gtest-port, 2 Gennadiy Civil 2018-03-29 09:46:13 -0400
  • 11855d8ef0 provide alternative for DebugBreak() Roland Leißa 2018-03-28 23:45:51 +0200
  • 9dde7c4e8c
    Merge pull request #1518 from gennadiycivil/master Gennadiy Civil 2018-03-27 15:39:32 -0400
  • aea6fc32aa merging gtest-port 1 of N Gennadiy Civil 2018-03-27 15:19:40 -0400
  • cafa9e5228
    Merge pull request #1515 from gennadiycivil/master Gennadiy Civil 2018-03-26 14:10:38 -0400
  • a75a5c9706 merges 1 Gennadiy Civil 2018-03-26 13:14:00 -0400
  • a0e2faf480 Merge branch 'master' of https://github.com/google/googletest Gennadiy Civil 2018-03-26 13:04:34 -0400
  • 3df7cbe6f7 merges, gtest Gennadiy Civil 2018-03-26 13:04:28 -0400
  • 78579756a8
    Merge pull request #1512 from gennadiycivil/master Gennadiy Civil 2018-03-26 11:19:10 -0400
  • 6aae206bc2 merging gmock-matchers.h 3 Gennadiy Civil 2018-03-26 10:36:26 -0400
  • 23187058e7 merging gmock-matchers.h 2 Gennadiy Civil 2018-03-26 10:16:59 -0400
  • 8ea10d3878 Upstreaming FloatingEq2Matcher, Gennadiy Civil 2018-03-26 09:28:16 -0400
  • b907c26740 Merging gmock-matchers.h -2 Gennadiy Civil 2018-03-23 11:42:41 -0400
  • 466a49ae30 gmock-matchers merging -2 Gennadiy Civil 2018-03-23 11:23:54 -0400
  • a28a7eb5e9 Merge branch 'master' of https://github.com/google/googletest Gennadiy Civil 2018-03-22 16:24:51 -0400
  • dfa853b63d
    Merge pull request #1510 from gennadiycivil/master Gennadiy Civil 2018-03-22 16:21:26 -0400
  • b7c568326c merging, gmock -1 Gennadiy Civil 2018-03-22 15:35:37 -0400
  • a1692ed133
    Merge branch 'master' into master Gennadiy Civil 2018-03-22 12:56:01 -0400
  • 4e89c76db8 reverting gtest_list_tests_unittest.py Gennadiy Civil 2018-03-22 12:37:38 -0400
  • eaaa422c52
    Update appveyor.yml Gennadiy Civil 2018-03-22 11:48:21 -0400
  • da71e8c870 more merges Gennadiy Civil 2018-03-22 10:58:18 -0400
  • 0f6567954f more merges Gennadiy Civil 2018-03-22 10:56:35 -0400
  • 691e38e518 More merges Gennadiy Civil 2018-03-21 16:31:31 -0400
  • dccc2d6754
    Merge pull request #1508 from gennadiycivil/master Gennadiy Civil 2018-03-19 13:32:25 -0400
  • a3c2e107ae cl 189032107, again Gennadiy Civil 2018-03-16 15:56:31 -0400
  • 080fcbe0aa cl 189032107 Gennadiy Civil 2018-03-16 13:36:36 -0400
  • a178cc7ef7 merge, again, IsRecursiveContainer Gennadiy Civil 2018-03-15 14:31:37 -0400
  • a325ad2db5
    Merge pull request #1504 from gennadiycivil/master Gennadiy Civil 2018-03-14 11:21:53 -0400
  • 262aaf2f1d erging, cont Gennadiy Civil 2018-03-14 10:49:18 -0400
  • 2814b4b089 merging, merging Gennadiy Civil 2018-03-13 16:02:05 -0400
  • a719320a3c fixing, was removing too much Gennadiy Civil 2018-03-13 11:53:27 -0400
  • 5461f63d01 Merge branch 'master' of https://github.com/google/googletest Gennadiy Civil 2018-03-13 11:13:58 -0400
  • af463c43ac More merges, removing old dead code Gennadiy Civil 2018-03-13 11:13:37 -0400
  • f35fe6de3b
    Merge pull request #1503 from sheepmaster/upstream_188748737 Gennadiy Civil 2018-03-12 15:04:50 -0400
  • fc437ef4b2
    Merge branch 'master' into upstream_188748737 Bernhard Bauer 2018-03-12 18:15:35 +0000
  • 7b70413e0c Allow macros inside of parametrized test names. Bernhard Bauer 2018-03-12 13:51:04 +0000
  • abc6e943e0
    Merge pull request #1502 from gennadiycivil/master Gennadiy Civil 2018-03-12 12:39:13 -0400
  • cf9d6344d2 merges-port(1) Gennadiy Civil 2018-03-12 11:51:44 -0400
  • 9bda90b7e5
    Merge pull request #1497 from gennadiycivil/master Gennadiy Civil 2018-03-07 16:14:48 -0500
  • e891900666 Merging, XML tests Gennadiy Civil 2018-03-07 15:57:55 -0500
  • 703b4a85a2
    Merge pull request #1493 from gennadiycivil/master Gennadiy Civil 2018-03-05 16:15:02 -0500
  • 89d6f70f34 merges-8 Gennadiy Civil 2018-03-05 15:53:36 -0500
  • 617e2c5615
    Merge pull request #1492 from gennadiycivil/master Gennadiy Civil 2018-03-05 15:52:38 -0500
  • 995a9dfa69 merges-7 Gennadiy Civil 2018-03-05 15:21:48 -0500
  • ae4480f923
    Merge pull request #1491 from gennadiycivil/master Gennadiy Civil 2018-03-05 14:41:37 -0500
  • 086825de5d merges-6 Gennadiy Civil 2018-03-05 14:21:41 -0500
  • 731dbc4a78
    Merge pull request #1490 from gennadiycivil/master Gennadiy Civil 2018-03-05 14:17:40 -0500
  • 94d78ea14b Merge branch 'master' of https://github.com/google/googletest Gennadiy Civil 2018-03-05 13:59:08 -0500
  • 8385928428 merges-3 Gennadiy Civil 2018-03-05 13:51:39 -0500
  • c3a007f3cf
    Merge pull request #1489 from gennadiycivil/master Gennadiy Civil 2018-03-05 13:51:15 -0500
  • 73bf41299d Merge branch 'master' of https://github.com/google/googletest Gennadiy Civil 2018-03-05 13:28:17 -0500
  • dbf63e38a4 merges-2 Gennadiy Civil 2018-03-05 13:28:13 -0500
  • a7ffeca974
    Merge pull request #1488 from gennadiycivil/master Gennadiy Civil 2018-03-05 13:21:59 -0500
  • a518bd5cf2 Merge branch 'master' of https://github.com/google/googletest Gennadiy Civil 2018-03-05 12:26:24 -0500
  • 0d5e01ad7b Merges-1 Gennadiy Civil 2018-03-05 12:26:15 -0500
  • 915c8d051d
    Merge pull request #1477 from sgraham/unsigned-wchar Gennadiy Civil 2018-03-05 11:03:08 -0500
  • 829a8c966b
    Merge branch 'master' into unsigned-wchar Gennadiy Civil 2018-03-05 10:43:19 -0500
  • 6d089311ca 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-03-05 09:02:59 +0000
  • a7a7f51d35
    Merge branch 'master' into fix_death_test_child_mingw_wer_issue1116 Tanzinul Islam 2018-03-05 02:25:59 +0000
  • 6c73adfc03
    Merge pull request #1486 from petrhosek/json-stacktrace Gennadiy Civil 2018-03-02 14:32:06 -0500
  • 7a2050d4d7 Use a full message in the JSON output for failures Petr Hosek 2018-03-01 13:19:34 -0800
  • f8fbe1c821
    Merge branch 'master' into unsigned-wchar Gennadiy Civil 2018-03-01 11:18:17 -0500
  • 447d58b4ee
    Merge pull request #1485 from coryan/parallelize-appveyor Gennadiy Civil 2018-02-28 15:23:40 -0500
  • 18d270e335
    Merge pull request #1479 from petrhosek/json Gennadiy Civil 2018-02-28 14:50:35 -0500
  • 3817871beb
    Merge branch 'master' into json Gennadiy Civil 2018-02-28 14:39:17 -0500
  • 3431b69909
    Add options to parallelize builds. Carlos O'Ryan 2018-02-28 11:28:57 -0500
  • 9557d29b7a
    Merge pull request #1481 from dneto0/debug-postfix Gennadiy Civil 2018-02-28 08:55:39 -0500
  • 66d71756a7
    Merge branch 'master' into debug-postfix Gennadiy Civil 2018-02-28 08:43:57 -0500
  • 6baf17e9d1 Support JSON output format in addition to XML Petr Hosek 2018-02-26 01:15:50 -0800
  • fe1144246e
    Merge pull request #1482 from zhangxy988/variant_matcher Gennadiy Civil 2018-02-27 16:58:28 -0500
  • e1622337ae Merge branch 'variant_matcher' of https://github.com/zhangxy988/googletest into variant_matcher Xiaoyi Zhang 2018-02-27 16:06:07 -0500
  • 576d689c19
    Merge branch 'master' into variant_matcher Xiaoyi Zhang 2018-02-27 16:03:36 -0500
  • 62be6f34d1 Merge branch 'variant_matcher' of https://github.com/zhangxy988/googletest into variant_matcher Xiaoyi Zhang 2018-02-27 16:01:14 -0500
  • 2eb31c185c Add documentation for VariantWith. Xiaoyi Zhang 2018-02-27 16:00:42 -0500
  • a9f2368dc0
    Merge pull request #1483 from gennadiycivil/master Gennadiy Civil 2018-02-27 14:39:41 -0500
  • ba40fd1456
    Merge branch 'master' into master Gennadiy Civil 2018-02-27 14:10:27 -0500
  • ce61dc54a2
    Merge pull request #1423 from pcc/win-libcxx2 Gennadiy Civil 2018-02-27 14:00:29 -0500