Commit Graph

  • 431bfdcaf4 msvc 14 Gennadiy Civil 2018-04-09 11:48:02 -04:00
  • 8bc7c631e8 testing msvc again Gennadiy Civil 2018-04-09 11:35:01 -04:00
  • c4e3d77ddc More msvc 14 Gennadiy Civil 2018-04-09 11:22:11 -04:00
  • 6525044ce2 And also silence for MSVS14 Gennadiy Civil 2018-04-09 10:51:15 -04:00
  • 35a709a701 preproc syntax ( I can never remember it) Gennadiy Civil 2018-04-09 10:25:59 -04:00
  • 61e8a0b10b syntax Gennadiy Civil 2018-04-09 10:08:12 -04:00
  • 03be5df17c cont. Gennadiy Civil 2018-04-09 09:59:09 -04:00
  • e0b3c269c2 continued Gennadiy Civil 2018-04-09 09:51:02 -04:00
  • d0de1180e4 Merge branch 'master' of github.com:google/googletest Gennadiy Civil 2018-04-09 09:29:37 -04:00
  • 7529698fa3
    Merge pull request #1552 from pwnall/mock-pump Gennadiy Civil 2018-04-09 09:28:35 -04:00
  • 51f8ad47df Sync gmock-generated-nice-strict.h.pump with gmock-generated-nice-strict.h. Victor Costan 2018-04-06 17:17:35 -07:00
  • dbd206e3d9 more mcvs fixing Gennadiy Civil 2018-04-06 16:55:46 -04:00
  • 701e1e5dc1 linkage, fixing MSVC Gennadiy Civil 2018-04-06 16:43:35 -04:00
  • 2d4d4ef739 fixing MSVC Gennadiy Civil 2018-04-06 16:31:11 -04:00
  • 4b6a7a49ab
    Merge branch 'master' into cleanup-cmake Henry Schreiner 2018-04-06 21:52:42 +02:00
  • 5fe8de5ded more warnings Gennadiy Civil 2018-04-06 11:40:04 -04:00
  • cb13dc759c more warnings Gennadiy Civil 2018-04-06 11:26:12 -04:00
  • d9f3611a22 more MSVC warnings Gennadiy Civil 2018-04-06 11:17:45 -04:00
  • c75b76e20a warnings Gennadiy Civil 2018-04-06 11:00:13 -04:00
  • 04e31881fc cont - 2 Gennadiy Civil 2018-04-06 10:52:49 -04:00
  • 32ac949254 cont Gennadiy Civil 2018-04-06 10:43:11 -04:00
  • 1831ac9361 more warnings Gennadiy Civil 2018-04-06 10:35:09 -04:00
  • eb3e4aac2e deal with MSVC warn, cont 1 Gennadiy Civil 2018-04-06 10:24:49 -04:00
  • 50c0bcd7e3 Cont. deal with MCVS warnings Gennadiy Civil 2018-04-06 10:15:00 -04:00
  • b5c87fbcb6 Deal with MCVS warnings Gennadiy Civil 2018-04-06 10:01:40 -04:00
  • 427b6a297f Merge branch 'master' of github.com:google/googletest Gennadiy Civil 2018-04-06 09:50:14 -04:00
  • 88fc7d7552 merging gmock-actions 2 Gennadiy Civil 2018-04-06 09:50:01 -04:00
  • 82febb8eaf
    Merge pull request #1549 from gennadiycivil/master Gennadiy Civil 2018-04-05 16:20:18 -04:00
  • bee1d13fcc Merge branch 'master' of github.com:google/googletest Gennadiy Civil 2018-04-05 16:09:31 -04:00
  • fe402c2779 Merging gMock, 2 Gennadiy Civil 2018-04-05 16:09:17 -04:00
  • d0905653ed
    Merge pull request #1547 from gennadiycivil/master Gennadiy Civil 2018-04-05 14:53:02 -04:00
  • 7e5f90d378 formatting Gennadiy Civil 2018-04-05 14:41:16 -04:00
  • 928636135b And more MCVS warnings Gennadiy Civil 2018-04-05 14:24:12 -04:00
  • e0f4cf0561 fixing MCVS warn Gennadiy Civil 2018-04-05 14:00:14 -04:00
  • 7045138a0d Have to wait for this one Gennadiy Civil 2018-04-05 11:59:59 -04:00
  • 66eaf9f0eb Have to wait for this one Gennadiy Civil 2018-04-05 11:55:25 -04:00
  • af93d59eb7 Merging matchers test Gennadiy Civil 2018-04-05 11:35:20 -04:00
  • 47d15bceea Merge branch 'master' of github.com:google/googletest Gennadiy Civil 2018-04-05 11:34:32 -04:00
  • 0cd6a4f5f5 Merging matchers test Gennadiy Civil 2018-04-05 11:34:19 -04:00
  • b22e8dec40 Clean up cache non-advanced variable for subproject Henry Fredrick Schreiner 2018-04-05 13:38:33 +02:00
  • 2cf2a1f8ce
    Merge pull request #1545 from gennadiycivil/master Gennadiy Civil 2018-04-04 16:14:41 -04:00
  • f7098a2a4d
    Merge branch 'master' into master Gennadiy Civil 2018-04-04 16:01:44 -04:00
  • d81b6a0c4c bad cut/paste Gennadiy Civil 2018-04-04 15:46:04 -04:00
  • a608d4a362 More on MSVC warning C4503, decorated name length exceeded Gennadiy Civil 2018-04-04 15:44:27 -04:00
  • 6f4e93943a More on MSVC warning C4503, decorated name length exceeded Gennadiy Civil 2018-04-04 15:29:05 -04:00
  • 5b3d27729b Address MSVC warning C4503, decorated name length exceeded, name was truncated Gennadiy Civil 2018-04-04 15:07:52 -04:00
  • aa14cc4285 Fixing build break on MSVC Gennadiy Civil 2018-04-04 14:48:06 -04:00
  • 891e436c6c
    Merge pull request #1543 from fo40225/fix_locale_win Gennadiy Civil 2018-04-04 14:28:11 -04:00
  • 0f790fa5a8 Merge branch 'master' of github.com:google/googletest Gennadiy Civil 2018-04-04 14:05:15 -04:00
  • e55089ec11 merging gmock matchers 1 Gennadiy Civil 2018-04-04 14:05:00 -04:00
  • fbe3c94533
    Merge branch 'master' into fix_locale_win Gennadiy Civil 2018-04-04 13:58:55 -04:00
  • 4377699066
    Merge pull request #1542 from gennadiycivil/master Gennadiy Civil 2018-04-04 11:35:28 -04:00
  • a0c27bd8a5 fix build break on locale windows fo40225 2018-04-04 23:16:16 +08:00
  • 1776ed8c1e Tweaking https://github.com/google/googletest/pull/1523 to exclude nacl Gennadiy Civil 2018-04-04 11:06:09 -04:00
  • 07af8af373
    Merge pull request #1523 from leissa/int3 Gennadiy Civil 2018-04-04 10:51:46 -04:00
  • 98687b7847
    Merge branch 'master' into int3 Gennadiy Civil 2018-04-03 16:31:59 -04:00
  • 7d955430d1
    Merge pull request #1541 from gennadiycivil/master Gennadiy Civil 2018-04-03 16:28:53 -04:00
  • 18be012457
    Merge branch 'master' into int3 Gennadiy Civil 2018-04-03 16:27:32 -04:00
  • 75ea13deb2 Merge branch 'master' of github.com:google/googletest Gennadiy Civil 2018-04-03 16:15:16 -04:00
  • d52aaee8eb Upstreaming, cl 191344765 Gennadiy Civil 2018-04-03 16:14:35 -04:00
  • ac783bd787
    Merge pull request #1539 from gennadiycivil/master Gennadiy Civil 2018-04-03 15:26:44 -04:00
  • 27507429cb
    Merge branch 'master' into int3 Gennadiy Civil 2018-04-03 11:44:23 -04:00
  • a2dd136578 merging port, cont. 191443078 Gennadiy Civil 2018-04-03 11:38:30 -04:00
  • 1065591bdb Merge branch 'master' of github.com:google/googletest Gennadiy Civil 2018-04-03 11:24:45 -04:00
  • aa349acb07 merging, cont - 2 Gennadiy Civil 2018-04-03 11:23:54 -04:00
  • 6c9d07f112
    Merge pull request #1538 from gennadiycivil/master Gennadiy Civil 2018-04-03 11:18:56 -04:00
  • 6abaa2467b Merge branch 'master' of github.com:google/googletest Gennadiy Civil 2018-04-03 11:06:34 -04:00
  • 2cedd5b9c1 merging gtest-port.h , 191439094 Gennadiy Civil 2018-04-03 11:06:20 -04:00
  • 653a435f99
    Merge pull request #1537 from gennadiycivil/master Gennadiy Civil 2018-04-03 10:09:08 -04:00
  • 04d1e56bd2 merging, just comments format Gennadiy Civil 2018-04-03 09:56:23 -04:00
  • 5beb452bbe testing, merge Gennadiy Civil 2018-04-03 09:45:49 -04:00
  • b8cbd53e02 Merge branch 'master' of github.com:google/googletest Gennadiy Civil 2018-04-03 09:31:49 -04:00
  • df5a48da03 Testing, gtest-port.h merge Gennadiy Civil 2018-04-03 09:31:10 -04:00
  • 9df719da8d
    Merge pull request #1534 from gennadiycivil/master Gennadiy Civil 2018-04-02 16:03:22 -04:00
  • 87a4cdddd0 merging gtest-port.h, again - 1 Gennadiy Civil 2018-04-02 14:22:24 -04:00
  • 5c7c365d5f Merge branch 'master' into fix_death_test_child_mingw_wer_issue1116 Tanzinul Islam 2018-04-01 13:43:57 +01:00
  • b1d18b85bd
    Merge branch 'master' into int3 Roland Leißa 2018-03-30 03:16:20 +02:00
  • 7888184f28
    Include OSX builds back into PR builds Gennadiy Civil 2018-03-29 13:50:32 -04:00
  • 86d14079be
    Merge pull request #1527 from google/revert-1518-master Gennadiy Civil 2018-03-29 13:28:47 -04:00
  • b2373c6f51
    Revert "merging gtest-port 1 of N" Gennadiy Civil 2018-03-29 13:28:29 -04:00
  • 527fd38867
    Merge pull request #1526 from google/revert-1525-master Gennadiy Civil 2018-03-29 13:28:04 -04:00
  • 54bb165ffd
    Revert "merging gtest-port, 2" Gennadiy Civil 2018-03-29 13:27:11 -04:00
  • e10ea42274 Merge remote-tracking branch 'google/master' into int3 Roland Leißa 2018-03-29 16:39:40 +02:00
  • d04bf07fad typo Roland Leißa 2018-03-29 16:38:23 +02:00
  • 09a0e17c6a
    Merge pull request #1525 from gennadiycivil/master Gennadiy Civil 2018-03-29 10:24:19 -04:00
  • 8e0364a37b merging gtest-port, 2 Gennadiy Civil 2018-03-29 09:46:13 -04:00
  • 11855d8ef0 provide alternative for DebugBreak() Roland Leißa 2018-03-28 23:45:51 +02:00
  • 9dde7c4e8c
    Merge pull request #1518 from gennadiycivil/master Gennadiy Civil 2018-03-27 15:39:32 -04:00
  • aea6fc32aa merging gtest-port 1 of N Gennadiy Civil 2018-03-27 15:19:40 -04:00
  • cafa9e5228
    Merge pull request #1515 from gennadiycivil/master Gennadiy Civil 2018-03-26 14:10:38 -04:00
  • a75a5c9706 merges 1 Gennadiy Civil 2018-03-26 13:14:00 -04:00
  • a0e2faf480 Merge branch 'master' of https://github.com/google/googletest Gennadiy Civil 2018-03-26 13:04:34 -04:00
  • 3df7cbe6f7 merges, gtest Gennadiy Civil 2018-03-26 13:04:28 -04:00
  • 78579756a8
    Merge pull request #1512 from gennadiycivil/master Gennadiy Civil 2018-03-26 11:19:10 -04:00
  • 6aae206bc2 merging gmock-matchers.h 3 Gennadiy Civil 2018-03-26 10:36:26 -04:00
  • 23187058e7 merging gmock-matchers.h 2 Gennadiy Civil 2018-03-26 10:16:59 -04:00
  • 8ea10d3878 Upstreaming FloatingEq2Matcher, Gennadiy Civil 2018-03-26 09:28:16 -04:00
  • b907c26740 Merging gmock-matchers.h -2 Gennadiy Civil 2018-03-23 11:42:41 -04:00
  • 466a49ae30 gmock-matchers merging -2 Gennadiy Civil 2018-03-23 11:23:54 -04:00
  • a28a7eb5e9 Merge branch 'master' of https://github.com/google/googletest Gennadiy Civil 2018-03-22 16:24:51 -04:00