summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Googletest exportkrzysio2018-11-073-116/+55
* Merge pull request #1950 from benjamincarman/makefixGennadiy Civil2018-11-021-1/+1
|\
| * Merge branch 'master' into makefixrefs/pull/1950/headGennadiy Civil2018-11-011-0/+15
| |\ | |/ |/|
* | Googletest exportmisterg2018-11-011-0/+15
| * Added line to sample Makefile in googletest/googletest/make to specify use of...Benjamin Carman2018-11-011-1/+1
|/
* Merge pull request #1948 from jerryturcios08/masterGennadiy Civil2018-10-311-1/+1
|\
| * Correct grammatical error in README.mdrefs/pull/1948/headJerry Turcios2018-10-311-1/+1
| * Merge branch 'master' of https://github.com/google/googletestJerry Turcios2018-10-3115-90/+53
| |\ | |/ |/|
* | Googletest exportAbseil Team2018-10-311-8/+19
* | Googletest exportmisterg2018-10-3113-80/+30
* | Googletest exportAbseil Team2018-10-311-2/+3
* | Merge pull request #1945 from akonradi/optional-matcher-docGennadiy Civil2018-10-301-0/+1
|\ \
| * | Add Optional() to the cheat sheet doc.refs/pull/1945/headAlex Konradi2018-10-291-0/+1
|/ /
| * Merge branch 'master' of https://github.com/google/googletestJerry Turcios2018-10-3036-811/+252
| |\ | |/ |/|
* | Googletest exportmisterg2018-10-291-1/+0
* | Merge pull request #1941 from barkovv:masterGennadiy Civil2018-10-2915-185/+157
|\ \
| * | Replaced all NULLs with nullptr in googlemockrefs/pull/1941/headVadim Barkov2018-10-285-10/+10
| * | Replaced all NULLs with nullptr in googletestVadim Barkov2018-10-2810-73/+73
* | | Googletest exportmisterg2018-10-2926-625/+95
|/ /
| * Merge branch 'master' of https://github.com/google/googletestJerry Turcios2018-10-281-51/+107
| |\ | |/ |/|
* | Googletest exportAbseil Team2018-10-261-51/+107
* | Googletest exportAbseil Team2018-10-2624-84/+624
* | Googletest exportmisterg2018-10-2624-624/+84
| * Merge branch 'master' of https://github.com/google/googletestJerry Turcios2018-10-254-11/+37
| |\ | |/ |/|
* | Merge pull request #1934 from jeffvandyke/patch-2Gennadiy Civil2018-10-241-6/+6
|\ \
| * | Change CMake googletest download location in docsrefs/pull/1934/headJeff VanDyke2018-10-241-6/+6
|/ /
* | Merge pull request #1890 from peterjc123:clang_fixGennadiy Civil2018-10-241-1/+8
|\ \
| * | Disable extensions and force standardrefs/pull/1890/headpeter2018-10-241-0/+2
| * | Revert previous changespeter2018-10-241-4/+0
| * | Fix -std=c++11 flagpeter2018-10-242-1/+10
* | | Googletest exportdurandal2018-10-242-4/+23
|/ /
| * Merge branch 'master' of https://github.com/google/googletestJerry Turcios2018-10-241-0/+9
| |\ | |/ |/|
* | Merge pull request #1929 from goatshriek/cmake-cxx11-flagGennadiy Civil2018-10-241-0/+9
|\ \
| * | add documentation of manual c++11 specificationrefs/pull/1929/headJoel Anderson2018-10-241-0/+9
|/ /
| * Merge branch 'master' of https://github.com/google/googletestJerry Turcios2018-10-244-1/+52
| |\ | |/ |/|
* | Update advanced.mdGennadiy Civil2018-10-231-1/+1
* | Merge pull request #1911 from BrukerJWD:isniceGennadiy Civil2018-10-235-3/+54
|\ \
| * | Removed last reference to internal::kDefaultrefs/pull/1911/headJonathan Wendeborn2018-10-161-1/+0
| * | Merge branch 'isnice' of https://github.com/BrukerJWD/googletest into isniceJonathan Wendeborn2018-10-16338-42718/+22620
| |\ \
| | * \ Merge branch 'master' into isniceBrukerJWD2018-10-16338-42718/+22620
| | |\ \
| * | | | Use existing Mock::GetReactionOnUninterestingCalls()Jonathan Wendeborn2018-10-161-17/+3
| |/ / /
| * | | Don't fully qualify enum memberJonathan Wendeborn2018-10-162-8/+5
| * | | Added Mock::IsNaggy, IsNice, and IsStrictJonathan Wendeborn2018-10-163-0/+69
* | | | Update advanced.mdGennadiy Civil2018-10-231-2/+1
* | | | Update advanced.mdGennadiy Civil2018-10-231-1/+1
* | | | Merge pull request #1927 from svg153/patch-1Gennadiy Civil2018-10-231-0/+1
|\ \ \ \
| * | | | ACTION table formatrefs/pull/1927/headSergio Valverde2018-10-231-0/+1
|/ / / /
| | | * Merge branch 'master' of https://github.com/google/googletestJerry Turcios2018-10-2314-58/+222
| | | |\ | |_|_|/ |/| | |
* | | | Googletest exportAbseil Team2018-10-223-37/+193
* | | | Merge pull request #1839 from Peter-Levine:python3-testsGennadiy Civil2018-10-227-13/+17
|\ \ \ \