Homec4science

Merge pull request #1551 from gennadiycivil/master

Description

Merge pull request #1551 from gennadiycivil/master

gmock actions 2

Details

Committed
GitHub <noreply@github.com>Apr 9 2018, 22:34
Pushed
trottetDec 4 2019, 13:52
Parents
R9484:64d24b810f37: ... and this
R9484:7529698fa378: Merge pull request #1552 from pwnall/mock-pump
Branches
Unknown
Tags
Unknown

Event Timeline

GitHub <noreply@github.com> committed R9484:7f03f7ceae05: Merge pull request #1551 from gennadiycivil/master (authored by Gennadiy Civil <gennadiycivil@users.noreply.github.com>).Apr 9 2018, 22:34

Merged Changes

CommitAuthorDetailsCommitted
64d24b810f37Gennadiy Civil
... and this 
Apr 9 2018
c1d4c34233e0Gennadiy Civil
this should be it 
Apr 9 2018
f5871009e6d8Gennadiy Civil
yet more 
Apr 9 2018
05b5a53898c2Gennadiy Civil
formatting 
Apr 9 2018
2de24fbf7a26Gennadiy Civil
tuning 
Apr 9 2018
055f32199a81Gennadiy Civil
tuning 
Apr 9 2018
57d6e824b44bGennadiy Civil
more 
Apr 9 2018
44da2b9ac5dfGennadiy Civil
cont 
Apr 9 2018
e93a0ece2684Gennadiy Civil
msvc 
Apr 9 2018
c4684b49cf0dGennadiy Civil
more msvc 
Apr 9 2018
431bfdcaf4a0Gennadiy Civil
msvc 14 
Apr 9 2018
8bc7c631e848Gennadiy Civil
testing msvc again 
Apr 9 2018
c4e3d77ddc15Gennadiy Civil
More msvc 14 
Apr 9 2018
6525044ce20cGennadiy Civil
And also silence for MSVS14 
Apr 9 2018
35a709a701cbGennadiy Civil
preproc syntax ( I can never remember it) 
Apr 9 2018
61e8a0b10b80Gennadiy Civil
syntax 
Apr 9 2018
03be5df17cc7Gennadiy Civil
cont. 
Apr 9 2018
e0b3c269c23eGennadiy Civil
continued 
Apr 9 2018
d0de1180e44bGennadiy Civil
Merge branch 'master' of github.com:google/googletest 
Apr 9 2018
dbd206e3d9aeGennadiy Civil
more mcvs fixing 
Apr 6 2018
701e1e5dc1ccGennadiy Civil
linkage, fixing MSVC 
Apr 6 2018
2d4d4ef7392bGennadiy Civil
fixing MSVC 
Apr 6 2018
5fe8de5ded68Gennadiy Civil
more warnings 
Apr 6 2018
cb13dc759c46Gennadiy Civil
more warnings 
Apr 6 2018
d9f3611a227cGennadiy Civil
more MSVC warnings 
Apr 6 2018
c75b76e20ae0Gennadiy Civil
warnings 
Apr 6 2018
04e31881fcc2Gennadiy Civil
cont - 2 
Apr 6 2018
32ac9492544cGennadiy Civil
cont 
Apr 6 2018
1831ac93611aGennadiy Civil
more warnings 
Apr 6 2018
eb3e4aac2e7fGennadiy Civil
deal with MSVC warn, cont 1 
Apr 6 2018
50c0bcd7e363Gennadiy Civil
Cont. deal with MCVS warnings 
Apr 6 2018
b5c87fbcb6b7Gennadiy Civil
Deal with MCVS warnings 
Apr 6 2018
427b6a297fa1Gennadiy Civil
Merge branch 'master' of github.com:google/googletest 
Apr 6 2018
88fc7d7552eaGennadiy Civil
merging gmock-actions 2 
Apr 6 2018