aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | | | | | | | | | msvc warningsGennadiy Civil2018-04-161-0/+11
| * | | | | | | | | | | | | | | | | | | | | merging gmock generated matchersGennadiy Civil2018-04-163-268/+414
|/ / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | Merge pull request #1576 from gennadiycivil/masterGennadiy Civil2018-04-161-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | merging, testing, this should be itGennadiy Civil2018-04-161-1/+1
| * | | | | | | | | | | | | | | | | | | | | mergingGennadiy Civil2018-04-161-3/+2
| * | | | | | | | | | | | | | | | | | | | | mergingGennadiy Civil2018-04-161-2/+3
|/ / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | Merge pull request #1571 from gennadiycivil/masterGennadiy Civil2018-04-141-1/+144
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | more pizzaGennadiy Civil2018-04-131-3/+2
| * | | | | | | | | | | | | | | | | | | | | more OSX pizzasGennadiy Civil2018-04-131-1/+2
| * | | | | | | | | | | | | | | | | | | | | osx pizzasGennadiy Civil2018-04-131-2/+3
| * | | | | | | | | | | | | | | | | | | | | merging gmock actions test Gennadiy Civil2018-04-131-0/+1
| * | | | | | | | | | | | | | | | | | | | | merging, gmock actions test Gennadiy Civil2018-04-131-1/+142
|/ / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | Merge pull request #1569 from gennadiycivil/masterGennadiy Civil2018-04-132-10/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of https://github.com/google/googletestGennadiy Civil2018-04-130-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | Merge pull request #1568 from gennadiycivil/masterGennadiy Civil2018-04-122-10/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | mergingGennadiy Civil2018-04-132-10/+13
| |/ / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | 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
|/ / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | Merge pull request #1567 from gennadiycivil/masterGennadiy Civil2018-04-123-3/+67
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | merging Gennadiy Civil2018-04-123-3/+67
|/ / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | Merge pull request #1566 from gennadiycivil/masterGennadiy Civil2018-04-122-18/+37
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | merging Gennadiy Civil2018-04-122-18/+37
|/ / / / / / / / / / / / / / / / / / / / /
* | | | | | | | | | | | | | | | | | | | | Merge pull request #1562 from gennadiycivil/masterGennadiy Civil2018-04-122-2/+16
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | 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-124-210/+224
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | Merge pull request #1557 from pwnall/gmock-fix-ubGennadiy Civil2018-04-124-210/+224
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | | | | | | | | Remove multiple inheritance from "unintesting call" mock classes.Victor Costan2018-04-124-210/+224
|/ / / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | Merge branch 'master' of https://github.com/google/googletestGennadiy Civil2018-04-120-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / / / / / / / / |/| | | | | | | | | | | | | | | | | | | | |
* | | | | | | | | | | | | | | | | | | | | | Merge pull request #1561 from gennadiycivil/masterGennadiy Civil2018-04-112-18/+74
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | | | | | | small cleanupGennadiy Civil2018-04-122-1/+15
| |/ / / / / / / / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | | | | | | ...mergingGennadiy Civil2018-04-111-1/+1
| * | | | | | | | | | | | | | | | | | | | | 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