aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * Merge branch 'master' of https://github.com/google/googletestGennadiy Civil2018-04-110-0/+0
| |\ | |/ |/|
* | Merge pull request #1560 from gennadiycivil/masterGennadiy Civil2018-04-111-2/+4
|\ \
| | * mergingGennadiy Civil2018-04-111-17/+73
| |/
| * Merge branch 'master' of https://github.com/google/googletestGennadiy Civil2018-04-110-0/+0
| |\ | |/ |/|
* | Merge pull request #1559 from gennadiycivil/masterGennadiy Civil2018-04-111-2/+2
|\ \
| | * Upstream cl/192179348Gennadiy Civil2018-04-111-2/+4
| |/
| * Merge branch 'master' of https://github.com/google/googletestGennadiy Civil2018-04-110-0/+0
| |\ | |/ |/|
* | Merge pull request #1558 from gennadiycivil/masterGennadiy Civil2018-04-1112-85/+388
|\ \
| | * mergingGennadiy Civil2018-04-111-2/+2
| |/
| * ..and this should be itGennadiy Civil2018-04-111-1/+15
| * moreGennadiy Civil2018-04-111-1/+1
| * pizza work, contGennadiy Civil2018-04-111-1/+2
| * osx pizzas, contGennadiy Civil2018-04-111-1/+2
| * fixing osx pizzaGennadiy Civil2018-04-111-1/+2
| * mergingGennadiy Civil2018-04-101-1/+1
| * mergingGennadiy Civil2018-04-102-6/+9
| * mergingGennadiy Civil2018-04-101-7/+10
| * mergeGennadiy Civil2018-04-109-260/+33
| |\ | |/ |/|
* | Include gcc on mac into PR matrixGennadiy Civil2018-04-101-1/+0
* | Merge pull request #1556 from google/revert-1551-masterGennadiy Civil2018-04-0913-303/+27
|\ \
| * | Revert "gmock actions 2"Gennadiy Civil2018-04-0913-303/+27
|/ /
* | Merge pull request #1551 from gennadiycivil/masterGennadiy Civil2018-04-0913-27/+303
|\ \
| * | ... and thisGennadiy Civil2018-04-091-8/+4
| * | this should be itGennadiy Civil2018-04-091-4/+0
| * | yet moreGennadiy Civil2018-04-092-4/+4
| * | 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-09 14:39:29 +0000