gitMirror/googletest
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Commit Graph

  • 854adb087b Merge branch 'master' of https://github.com/google/googletest Gennadiy Civil 2018-04-12 09:12:15 -0400
  • e77deb29a6 small cleanup Gennadiy Civil 2018-04-12 09:12:02 -0400
  • 1324e2d706 Remove multiple inheritance from "unintesting call" mock classes. Victor Costan 2018-04-09 21:57:54 -0700
  • fdb57f8571
         Merge pull request #1561 from gennadiycivil/master Gennadiy Civil 2018-04-11 16:06:23 -0400
  • 373481c5a9 ...merging Gennadiy Civil 2018-04-11 15:46:57 -0400
  • ef17a9f98a Merge branch 'master' of https://github.com/google/googletest Gennadiy Civil 2018-04-11 15:38:25 -0400
  • 6273647250
         Merge pull request #1560 from gennadiycivil/master Gennadiy Civil 2018-04-11 15:38:15 -0400
  • 8654c1ca10 merging Gennadiy Civil 2018-04-11 15:33:31 -0400
  • af4cfd5088 Merge branch 'master' of https://github.com/google/googletest Gennadiy Civil 2018-04-11 15:24:25 -0400
  • ab84d14281 Upstream cl/192179348 Gennadiy Civil 2018-04-11 15:24:04 -0400
  • b4429c9219
         Merge pull request #1559 from gennadiycivil/master Gennadiy Civil 2018-04-11 13:57:33 -0400
  • 106e731e68 Merge branch 'master' of https://github.com/google/googletest Gennadiy Civil 2018-04-11 13:20:55 -0400
  • c13ab6003b merging Gennadiy Civil 2018-04-11 13:20:36 -0400
  • d5988e7dd0
         Merge pull request #1558 from gennadiycivil/master Gennadiy Civil 2018-04-11 10:22:10 -0400
  • 5cd213ea5e ..and this should be it Gennadiy Civil 2018-04-11 10:10:24 -0400
  • 6a7573a7de more Gennadiy Civil 2018-04-11 09:55:36 -0400
  • 039d9b54c2 pizza work, cont Gennadiy Civil 2018-04-11 09:47:38 -0400
  • f15fd9610b osx pizzas, cont Gennadiy Civil 2018-04-11 09:33:51 -0400
  • b15be9a819 fixing osx pizza Gennadiy Civil 2018-04-11 09:20:48 -0400
  • 6f9db26159 merging Gennadiy Civil 2018-04-10 16:34:21 -0400
  • 9bc82ce725 merging Gennadiy Civil 2018-04-10 16:22:50 -0400
  • 25d8176e4f merging Gennadiy Civil 2018-04-10 16:18:23 -0400
  • 39c58da187 merge Gennadiy Civil 2018-04-10 16:10:34 -0400
  • e1071eb949 RE-Doing the merge, this time with gcc on mac in the PR so I can catch errors before merging the PR Gennadiy Civil 2018-04-10 15:57:16 -0400
  • 8fbb419470
         Include gcc on mac into PR matrix Gennadiy Civil 2018-04-10 11:28:16 -0400
  • a072611118
         Merge pull request #1556 from google/revert-1551-master Gennadiy Civil 2018-04-09 22:37:50 -0400
  • ca54b67303
         Revert "gmock actions 2" Gennadiy Civil 2018-04-09 22:10:12 -0400
  • 7f03f7ceae
         Merge pull request #1551 from gennadiycivil/master Gennadiy Civil 2018-04-09 16:34:54 -0400
  • 64d24b810f ... and this Gennadiy Civil 2018-04-09 16:24:30 -0400
  • c1d4c34233 this should be it Gennadiy Civil 2018-04-09 16:13:45 -0400
  • f5871009e6 yet more Gennadiy Civil 2018-04-09 16:04:48 -0400
  • 05b5a53898 formatting Gennadiy Civil 2018-04-09 15:50:19 -0400
  • 2de24fbf7a tuning Gennadiy Civil 2018-04-09 15:39:12 -0400
  • 055f32199a tuning Gennadiy Civil 2018-04-09 15:38:38 -0400
  • 57d6e824b4 more Gennadiy Civil 2018-04-09 15:33:56 -0400
  • 44da2b9ac5 cont Gennadiy Civil 2018-04-09 15:23:00 -0400
  • e93a0ece26 msvc Gennadiy Civil 2018-04-09 13:51:01 -0400
  • c4684b49cf more msvc Gennadiy Civil 2018-04-09 12:03:40 -0400
  • 431bfdcaf4 msvc 14 Gennadiy Civil 2018-04-09 11:48:02 -0400
  • 8bc7c631e8 testing msvc again Gennadiy Civil 2018-04-09 11:35:01 -0400
  • c4e3d77ddc More msvc 14 Gennadiy Civil 2018-04-09 11:22:11 -0400
  • 6525044ce2 And also silence for MSVS14 Gennadiy Civil 2018-04-09 10:51:15 -0400
  • 35a709a701 preproc syntax ( I can never remember it) Gennadiy Civil 2018-04-09 10:25:59 -0400
  • 61e8a0b10b syntax Gennadiy Civil 2018-04-09 10:08:12 -0400
  • 03be5df17c cont. Gennadiy Civil 2018-04-09 09:59:09 -0400
  • e0b3c269c2 continued Gennadiy Civil 2018-04-09 09:51:02 -0400
  • d0de1180e4 Merge branch 'master' of github.com:google/googletest Gennadiy Civil 2018-04-09 09:29:37 -0400
  • 7529698fa3
         Merge pull request #1552 from pwnall/mock-pump Gennadiy Civil 2018-04-09 09:28:35 -0400
  • 51f8ad47df Sync gmock-generated-nice-strict.h.pump with gmock-generated-nice-strict.h. Victor Costan 2018-04-06 17:17:35 -0700
  • dbd206e3d9 more mcvs fixing Gennadiy Civil 2018-04-06 16:55:46 -0400
  • 701e1e5dc1 linkage, fixing MSVC Gennadiy Civil 2018-04-06 16:43:35 -0400
  • 2d4d4ef739 fixing MSVC Gennadiy Civil 2018-04-06 16:31:11 -0400
  • 4b6a7a49ab
         Merge branch 'master' into cleanup-cmake Henry Schreiner 2018-04-06 21:52:42 +0200
  • 5fe8de5ded more warnings Gennadiy Civil 2018-04-06 11:40:04 -0400
  • cb13dc759c more warnings Gennadiy Civil 2018-04-06 11:26:12 -0400
  • d9f3611a22 more MSVC warnings Gennadiy Civil 2018-04-06 11:17:45 -0400
  • c75b76e20a warnings Gennadiy Civil 2018-04-06 11:00:13 -0400
  • 04e31881fc cont - 2 Gennadiy Civil 2018-04-06 10:52:49 -0400
  • 32ac949254 cont Gennadiy Civil 2018-04-06 10:43:11 -0400
  • 1831ac9361 more warnings Gennadiy Civil 2018-04-06 10:35:09 -0400
  • eb3e4aac2e deal with MSVC warn, cont 1 Gennadiy Civil 2018-04-06 10:24:49 -0400
  • 50c0bcd7e3 Cont. deal with MCVS warnings Gennadiy Civil 2018-04-06 10:15:00 -0400
  • b5c87fbcb6 Deal with MCVS warnings Gennadiy Civil 2018-04-06 10:01:40 -0400
  • 427b6a297f Merge branch 'master' of github.com:google/googletest Gennadiy Civil 2018-04-06 09:50:14 -0400
  • 88fc7d7552 merging gmock-actions 2 Gennadiy Civil 2018-04-06 09:50:01 -0400
  • 82febb8eaf
         Merge pull request #1549 from gennadiycivil/master Gennadiy Civil 2018-04-05 16:20:18 -0400
  • bee1d13fcc Merge branch 'master' of github.com:google/googletest Gennadiy Civil 2018-04-05 16:09:31 -0400
  • fe402c2779 Merging gMock, 2 Gennadiy Civil 2018-04-05 16:09:17 -0400
  • d0905653ed
         Merge pull request #1547 from gennadiycivil/master Gennadiy Civil 2018-04-05 14:53:02 -0400
  • 7e5f90d378 formatting Gennadiy Civil 2018-04-05 14:41:16 -0400
  • 928636135b And more MCVS warnings Gennadiy Civil 2018-04-05 14:24:12 -0400
  • e0f4cf0561 fixing MCVS warn Gennadiy Civil 2018-04-05 14:00:14 -0400
  • 7045138a0d Have to wait for this one Gennadiy Civil 2018-04-05 11:59:59 -0400
  • 66eaf9f0eb Have to wait for this one Gennadiy Civil 2018-04-05 11:55:25 -0400
  • af93d59eb7 Merging matchers test Gennadiy Civil 2018-04-05 11:35:20 -0400
  • 47d15bceea Merge branch 'master' of github.com:google/googletest Gennadiy Civil 2018-04-05 11:34:32 -0400
  • 0cd6a4f5f5 Merging matchers test Gennadiy Civil 2018-04-05 11:34:19 -0400
  • b22e8dec40 Clean up cache non-advanced variable for subproject Henry Fredrick Schreiner 2018-04-05 13:38:33 +0200
  • 2cf2a1f8ce
         Merge pull request #1545 from gennadiycivil/master Gennadiy Civil 2018-04-04 16:14:41 -0400
  • f7098a2a4d
         Merge branch 'master' into master Gennadiy Civil 2018-04-04 16:01:44 -0400
  • d81b6a0c4c bad cut/paste Gennadiy Civil 2018-04-04 15:46:04 -0400
  • a608d4a362 More on MSVC warning C4503, decorated name length exceeded Gennadiy Civil 2018-04-04 15:44:27 -0400
  • 6f4e93943a More on MSVC warning C4503, decorated name length exceeded Gennadiy Civil 2018-04-04 15:29:05 -0400
  • 5b3d27729b Address MSVC warning C4503, decorated name length exceeded, name was truncated Gennadiy Civil 2018-04-04 15:07:52 -0400
  • aa14cc4285 Fixing build break on MSVC Gennadiy Civil 2018-04-04 14:48:06 -0400
  • 891e436c6c
         Merge pull request #1543 from fo40225/fix_locale_win Gennadiy Civil 2018-04-04 14:28:11 -0400
  • 0f790fa5a8 Merge branch 'master' of github.com:google/googletest Gennadiy Civil 2018-04-04 14:05:15 -0400
  • e55089ec11 merging gmock matchers 1 Gennadiy Civil 2018-04-04 14:05:00 -0400
  • fbe3c94533
         Merge branch 'master' into fix_locale_win Gennadiy Civil 2018-04-04 13:58:55 -0400
  • 4377699066
         Merge pull request #1542 from gennadiycivil/master Gennadiy Civil 2018-04-04 11:35:28 -0400
  • a0c27bd8a5 fix build break on locale windows fo40225 2018-04-04 23:16:16 +0800
  • 1776ed8c1e Tweaking https://github.com/google/googletest/pull/1523 to exclude nacl Gennadiy Civil 2018-04-04 11:06:09 -0400
  • 07af8af373
         Merge pull request #1523 from leissa/int3 Gennadiy Civil 2018-04-04 10:51:46 -0400
  • 98687b7847
         Merge branch 'master' into int3 Gennadiy Civil 2018-04-03 16:31:59 -0400
  • 7d955430d1
         Merge pull request #1541 from gennadiycivil/master Gennadiy Civil 2018-04-03 16:28:53 -0400
  • 18be012457
         Merge branch 'master' into int3 Gennadiy Civil 2018-04-03 16:27:32 -0400
  • 75ea13deb2 Merge branch 'master' of github.com:google/googletest Gennadiy Civil 2018-04-03 16:15:16 -0400
  • d52aaee8eb Upstreaming, cl 191344765 Gennadiy Civil 2018-04-03 16:14:35 -0400
  • ac783bd787
         Merge pull request #1539 from gennadiycivil/master Gennadiy Civil 2018-04-03 15:26:44 -0400
  • 27507429cb
         Merge branch 'master' into int3 Gennadiy Civil 2018-04-03 11:44:23 -0400