aboutsummaryrefslogtreecommitdiffstats
path: root/googlemock/test
Commit message (Expand)AuthorAgeFilesLines
...
* more fixing osx libstd++ bugsGennadiy Civil2018-04-121-1/+2
* fixing Gennadiy Civil2018-04-121-0/+1
* merging, fix OSX issueGennadiy Civil2018-04-122-2/+2
* mergingGennadiy Civil2018-04-122-10/+8
* merging Gennadiy Civil2018-04-121-3/+47
* merging Gennadiy Civil2018-04-121-0/+23
* msvcGennadiy Civil2018-04-121-2/+2
* revert this oneGennadiy Civil2018-04-121-1/+1
* merge, ... gmock-matchers testGennadiy Civil2018-04-121-3/+3
* Merge branch 'master' of https://github.com/google/googletestGennadiy Civil2018-04-121-0/+21
|\
| * Remove multiple inheritance from "unintesting call" mock classes.Victor Costan2018-04-121-0/+21
* | small cleanupGennadiy Civil2018-04-121-1/+7
|/
* 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-3/+5
* mergeGennadiy Civil2018-04-102-148/+4
|\
| * Revert "gmock actions 2"Gennadiy Civil2018-04-092-169/+1
| * ... and thisGennadiy Civil2018-04-091-8/+4
| * formattingGennadiy Civil2018-04-092-2/+3
| * tuningGennadiy Civil2018-04-091-1/+1
| * tuningGennadiy Civil2018-04-091-3/+7
| * contGennadiy Civil2018-04-091-3/+0
| * msvcGennadiy Civil2018-04-092-12/+13
| * more msvcGennadiy Civil2018-04-091-0/+15
| * msvc 14Gennadiy Civil2018-04-091-14/+0
| * testing msvc againGennadiy Civil2018-04-092-16/+14
| * More msvc 14 Gennadiy Civil2018-04-091-0/+16
* | RE-Doing the merge, this time with gcc on mac in the PR so I can catch errors...Gennadiy Civil2018-04-103-9/+22
|/
* more warningsGennadiy Civil2018-04-061-0/+12
* merging gmock-actions 2Gennadiy Civil2018-04-061-1/+143
* Merging gMock, 2Gennadiy Civil2018-04-054-3/+14
* 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
* Merging matchers testGennadiy Civil2018-04-051-40/+779
* bad cut/pasteGennadiy Civil2018-04-041-1/+1
* More on MSVC warning C4503, decorated name length exceededGennadiy Civil2018-04-041-2/+6
* More on MSVC warning C4503, decorated name length exceededGennadiy Civil2018-04-041-1/+1
* Address MSVC warning C4503, decorated name length exceeded, name was truncatedGennadiy Civil2018-04-041-0/+2
* Fixing build break on MSVCGennadiy Civil2018-04-041-1/+1
* merging gmock matchers 1Gennadiy Civil2018-04-041-37/+262
* merging, gmock -1Gennadiy Civil2018-03-222-1/+33
* More merges, removing old dead codeGennadiy Civil2018-03-131-2/+2
* Merge branch 'master' of https://github.com/google/googletestGennadiy Civil2018-03-051-0/+4
|\
| * Merge branch 'master' into unsigned-wcharGennadiy Civil2018-03-012-2/+86
| |\
| * | Try to handle unsigned wchar_t (arm) a bit betterScott Graham2018-02-231-0/+4
* | | Merges-1Gennadiy Civil2018-03-051-0/+2
| |/ |/|
* | Merge branch 'master' into variant_matcherXiaoyi Zhang2018-02-271-2/+22
|\ \