Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Mark new GetWithoutMatchers method as part of the exported API, to address MS... | David Sunderland | 2018-04-18 | 2 | -2/+2 |
* | Merge branch 'parameterless' of https://github.com/dnsunderland/googletest in... | David Sunderland | 2018-04-18 | 5 | -270/+438 |
|\ | |||||
| * | Merge branch 'master' into parameterless | dnsunderland | 2018-04-18 | 5 | -270/+438 |
| |\ | |||||
| | * | Merge pull request #1579 from gennadiycivil/master | Gennadiy Civil | 2018-04-18 | 2 | -4/+16 |
| | |\ | |||||
| | | * | Merge branch 'master' of github.com:google/googletest | Gennadiy Civil | 2018-04-18 | 0 | -0/+0 |
| | | |\ | | | |/ | | |/| | |||||
| | * | | Merge pull request #1577 from gennadiycivil/master | Gennadiy Civil | 2018-04-17 | 5 | -270/+426 |
| | |\ \ | |||||
| | | | * | 193353312 | Gennadiy Civil | 2018-04-18 | 2 | -4/+16 |
| | | |/ | |||||
| | | * | cl/193060888 | Gennadiy Civil | 2018-04-17 | 1 | -3/+3 |
| | | * | http://cl/193060888 | Gennadiy Civil | 2018-04-17 | 1 | -30/+6 |
| | | * | http://cl/193060888 | Gennadiy Civil | 2018-04-17 | 2 | -5/+55 |
| | | * | test-meerging | Gennadiy Civil | 2018-04-16 | 2 | -34/+6 |
| | | * | typo | Gennadiy Civil | 2018-04-16 | 1 | -1/+1 |
| | | * | more msvc | Gennadiy Civil | 2018-04-16 | 1 | -1/+2 |
| | | * | typo | Gennadiy Civil | 2018-04-16 | 1 | -1/+1 |
| | | * | msvc warnings | Gennadiy Civil | 2018-04-16 | 1 | -0/+11 |
| | | * | merging gmock generated matchers | Gennadiy Civil | 2018-04-16 | 3 | -268/+414 |
| | |/ | |||||
* | / | Don't use generalized initializer list; is C++11 extension. | David Sunderland | 2018-04-18 | 1 | -1/+1 |
|/ / | |||||
* / | Clone of unsubmitted cr/176529515. Introduce parameterless expectations. | David Sunderland | 2018-04-18 | 7 | -13/+426 |
|/ | |||||
* | Merge pull request #1576 from gennadiycivil/master | Gennadiy Civil | 2018-04-16 | 1 | -1/+1 |
|\ | |||||
| * | merging, testing, this should be it | Gennadiy Civil | 2018-04-16 | 1 | -1/+1 |
| * | merging | Gennadiy Civil | 2018-04-16 | 1 | -3/+2 |
| * | merging | Gennadiy Civil | 2018-04-16 | 1 | -2/+3 |
|/ | |||||
* | Merge pull request #1571 from gennadiycivil/master | Gennadiy Civil | 2018-04-14 | 1 | -1/+144 |
|\ | |||||
| * | more pizza | Gennadiy Civil | 2018-04-13 | 1 | -3/+2 |
| * | more OSX pizzas | Gennadiy Civil | 2018-04-13 | 1 | -1/+2 |
| * | osx pizzas | Gennadiy Civil | 2018-04-13 | 1 | -2/+3 |
| * | merging gmock actions test | Gennadiy Civil | 2018-04-13 | 1 | -0/+1 |
| * | merging, gmock actions test | Gennadiy Civil | 2018-04-13 | 1 | -1/+142 |
|/ | |||||
* | Merge pull request #1569 from gennadiycivil/master | Gennadiy Civil | 2018-04-13 | 2 | -10/+13 |
|\ | |||||
| * | Merge branch 'master' of https://github.com/google/googletest | Gennadiy Civil | 2018-04-13 | 0 | -0/+0 |
| |\ | |/ |/| | |||||
* | | Merge pull request #1568 from gennadiycivil/master | Gennadiy Civil | 2018-04-12 | 2 | -10/+10 |
|\ \ | |||||
| | * | merging | Gennadiy Civil | 2018-04-13 | 2 | -10/+13 |
| |/ | |||||
| * | more fixing osx libstd++ bugs | Gennadiy Civil | 2018-04-12 | 1 | -1/+2 |
| * | fixing | Gennadiy Civil | 2018-04-12 | 1 | -0/+1 |
| * | merging, fix OSX issue | Gennadiy Civil | 2018-04-12 | 2 | -2/+2 |
| * | merging | Gennadiy Civil | 2018-04-12 | 2 | -10/+8 |
|/ | |||||
* | Merge pull request #1567 from gennadiycivil/master | Gennadiy Civil | 2018-04-12 | 3 | -3/+67 |
|\ | |||||
| * | merging | Gennadiy Civil | 2018-04-12 | 3 | -3/+67 |
|/ | |||||
* | Merge pull request #1566 from gennadiycivil/master | Gennadiy Civil | 2018-04-12 | 2 | -18/+37 |
|\ | |||||
| * | merging | Gennadiy Civil | 2018-04-12 | 2 | -18/+37 |
|/ | |||||
* | Merge pull request #1562 from gennadiycivil/master | Gennadiy Civil | 2018-04-12 | 2 | -2/+16 |
|\ | |||||
| * | msvc | Gennadiy Civil | 2018-04-12 | 1 | -2/+2 |
| * | revert this one | Gennadiy Civil | 2018-04-12 | 1 | -1/+1 |
| * | merge, ... gmock-matchers test | Gennadiy Civil | 2018-04-12 | 1 | -3/+3 |
| * | Merge branch 'master' of https://github.com/google/googletest | Gennadiy Civil | 2018-04-12 | 4 | -210/+224 |
| |\ | |/ |/| | |||||
* | | Merge pull request #1557 from pwnall/gmock-fix-ub | Gennadiy Civil | 2018-04-12 | 4 | -210/+224 |
|\ \ | |||||
| * | | Remove multiple inheritance from "unintesting call" mock classes. | Victor Costan | 2018-04-12 | 4 | -210/+224 |
|/ / | |||||
| * | Merge branch 'master' of https://github.com/google/googletest | Gennadiy Civil | 2018-04-12 | 0 | -0/+0 |
| |\ | |/ |/| | |||||
* | | Merge pull request #1561 from gennadiycivil/master | Gennadiy Civil | 2018-04-11 | 2 | -18/+74 |
|\ \ | |||||
| | * | small cleanup | Gennadiy Civil | 2018-04-12 | 2 | -1/+15 |
| |/ |