aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | formattingGennadiy Civil2018-04-094-4/+7
| * | tuningGennadiy Civil2018-04-091-1/+1
| * | tuningGennadiy Civil2018-04-091-3/+7
| * | moreGennadiy Civil2018-04-091-6/+9
| * | contGennadiy Civil2018-04-091-3/+0
| * | msvcGennadiy Civil2018-04-092-12/+13
| * | more msvcGennadiy Civil2018-04-092-16/+15
| * | msvc 14Gennadiy Civil2018-04-092-14/+16
| * | testing msvc againGennadiy Civil2018-04-092-16/+14
| * | More msvc 14 Gennadiy Civil2018-04-091-0/+16
| * | And also silence for MSVS14Gennadiy Civil2018-04-091-2/+2
| * | preproc syntax ( I can never remember it)Gennadiy Civil2018-04-091-5/+9
| * | syntaxGennadiy Civil2018-04-091-2/+2
| * | cont.Gennadiy Civil2018-04-091-2/+2
| * | continuedGennadiy Civil2018-04-095-7/+8
| | * RE-Doing the merge, this time with gcc on mac in the PR so I can catch errors...Gennadiy Civil2018-04-1010-96/+346
| |/
| * Merge branch 'master' of github.com:google/googletestGennadiy Civil2018-04-091-30/+60
| |\ | |/ |/|
* | Merge pull request #1552 from pwnall/mock-pumpGennadiy Civil2018-04-091-30/+60
|\ \
| * | Sync gmock-generated-nice-strict.h.pump with gmock-generated-nice-strict.h.Victor Costan2018-04-061-30/+60
|/ /
| * more mcvs fixingGennadiy Civil2018-04-061-0/+12
| * linkage, fixing MSVCGennadiy Civil2018-04-061-1/+1
| * fixing MSVCGennadiy Civil2018-04-062-1/+3
| * more warningsGennadiy Civil2018-04-061-0/+12
| * more warningsGennadiy Civil2018-04-061-0/+1
| * more MSVC warningsGennadiy Civil2018-04-061-0/+11
| * warningsGennadiy Civil2018-04-061-1/+2
| * cont - 2Gennadiy Civil2018-04-061-1/+1
| * contGennadiy Civil2018-04-061-1/+1
| * more warningsGennadiy Civil2018-04-061-1/+1
| * deal with MSVC warn, cont 1Gennadiy Civil2018-04-061-2/+1
| * Cont. deal with MCVS warningsGennadiy Civil2018-04-062-2/+16
| * Deal with MCVS warningsGennadiy Civil2018-04-061-0/+6
| * Merge branch 'master' of github.com:google/googletestGennadiy Civil2018-04-060-0/+0
| |\ | |/ |/|
* | Merge pull request #1549 from gennadiycivil/masterGennadiy Civil2018-04-059-420/+573
|\ \
| | * merging gmock-actions 2Gennadiy Civil2018-04-062-18/+216
| |/
| * Merge branch 'master' of github.com:google/googletestGennadiy Civil2018-04-050-0/+0
| |\ | |/ |/|
* | Merge pull request #1547 from gennadiycivil/masterGennadiy Civil2018-04-052-37/+788
|\ \
| | * Merging gMock, 2Gennadiy Civil2018-04-059-420/+573
| |/
| * formattingGennadiy Civil2018-04-051-2/+2
| * And more MCVS warningsGennadiy Civil2018-04-051-5/+4
| * fixing MCVS warnGennadiy Civil2018-04-051-0/+10
| * Have to wait for this oneGennadiy Civil2018-04-051-2/+2
| * Have to wait for this oneGennadiy Civil2018-04-051-1/+1
| * Merging matchers testGennadiy Civil2018-04-051-0/+3
| * Merge branch 'master' of github.com:google/googletestGennadiy Civil2018-04-051-1/+1
| |\ | |/ |/|
* | Merge pull request #1545 from gennadiycivil/masterGennadiy Civil2018-04-043-70/+487
|\ \
| * \ Merge branch 'master' into masterGennadiy Civil2018-04-041-1/+1
| |\ \ | |/ / |/| |
* | | Merge pull request #1543 from fo40225/fix_locale_winGennadiy Civil2018-04-041-1/+1
|\ \ \
| * \ \ Merge branch 'master' into fix_locale_winGennadiy Civil2018-04-041-1/+3
| |\ \ \ | |/ / / |/| | |
| * | | fix build break on locale windowsfo402252018-04-041-1/+1