aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
|
* 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
| | * Sync gmock-generated-nice-strict.h.pump with gmock-generated-nice-strict.h.Victor Costan2018-04-061-30/+60
| |/ | | | | | | | | | | | | | | | | | | | | | | | | | | Commit fe402c27790ff1cc9a7e17c5d0aea4ebe7fd8a71 published the changes in internal CL 156157936, but missed the diff in gmock-generated-nice-strict.h.pump. This makes it difficult to reason about the change, because the .pump file is more concise than the generated file. This PR was tested by re-generating the .h file using the command below and checking the git diff. ./googletest/scripts/pump.py \ googlemock/include/gmock/gmock-generated-nice-strict.h.pump
* | 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, 2
* | | 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
| |\ | | | | | | Matchers testing
* | | 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
| |\ | | | | | | merging gmock matchers 1
| | * Merge branch 'master' into masterGennadiy Civil2018-04-041-1/+1
| | |\ | | |/ | |/|
| * | Merge pull request #1543 from fo40225/fix_locale_winGennadiy Civil2018-04-041-1/+1
| |\ \ | | | | | | | | fix build break on locale windows
| | * \ Merge branch 'master' into fix_locale_winGennadiy Civil2018-04-041-1/+3
| | |\ \ | | |/ / | |/| |
| | * | fix build break on locale windowsfo402252018-04-041-1/+1
| | | |
* | | | Merging matchers testGennadiy Civil2018-04-051-40/+779
| |_|/ |/| |
* | | bad cut/pasteGennadiy Civil2018-04-041-1/+1
| | |