summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
|/
* Googletest exportAbseil Team2018-10-261-51/+107
* Googletest exportAbseil Team2018-10-2624-84/+624
* Googletest exportmisterg2018-10-2624-624/+84
* 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 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
|/
* 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
|/ / /
* | | Googletest exportAbseil Team2018-10-223-37/+193
* | | Merge pull request #1839 from Peter-Levine:python3-testsGennadiy Civil2018-10-227-13/+17
|\ \ \
| * \ \ Merge branch 'master' into python3-testsrefs/pull/1839/headGennadiy Civil2018-10-1952-9470/+1895
| |\ \ \
| * \ \ \ Merge branch 'master' into python3-testsGennadiy Civil2018-10-0560-1187/+726
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' into python3-testsGennadiy Civil2018-10-0417-79/+351
| |\ \ \ \ \
| * \ \ \ \ \ Merge branch 'master' into python3-testsGennadiy Civil2018-09-269-680/+65
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' into python3-testsGennadiy Civil2018-09-257-46/+149
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' into python3-testsGennadiy Civil2018-09-205-3/+32
| |\ \ \ \ \ \ \ \
| * | | | | | | | | Fix Python3 supportPeter Levine2018-09-147-13/+17
* | | | | | | | | | Merge pull request #1905 from fandjelo:relocatable-pkgconfig-fixGennadiy Civil2018-10-224-8/+12
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / |/| | | | | | | | |
| * | | | | | | | | Merge branch 'master' into relocatable-pkgconfig-fixrefs/pull/1905/headGennadiy Civil2018-10-171-5/+6
| |\ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|/ | | |/| | | | | | |
| * | | | | | | | | Merge branch 'master' into relocatable-pkgconfig-fixGennadiy Civil2018-10-1211-44/+23
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | Use pcfiledir for prefix in pkgconfig fileFilipp Andjelo2018-10-114-8/+12
* | | | | | | | | | | Update .travis.ymlGennadiy Civil2018-10-191-1/+1
* | | | | | | | | | | Update .travis.ymlGennadiy Civil2018-10-181-1/+1
* | | | | | | | | | | Googletest exportmisterg2018-10-186-4417/+79
* | | | | | | | | | | Merge pull request #1912 from kakkoko:fix-xml-nameGennadiy Civil2018-10-181-1/+1
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | Fix incorrect XML file name in help messagerefs/pull/1912/headkakkoko2018-10-171-1/+1
| | |_|/ / / / / / / / | |/| | | | | | | | |
* | | | | | | | | | | Googletest exportAbseil Team2018-10-1811-441/+342
|/ / / / / / / / / /
* | | | | | | | | | Merge pull request #1908 from rwoldberg:masterGennadiy Civil2018-10-121-5/+6
|\ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / |/| | | | | | | | |
| * | | | | | | | | Change types to remove cast warnings.refs/pull/1908/headRobert Woldberg2018-10-121-3/+3
|/ / / / / / / / /
* | | | | | | | | Remove duplicate functionality PrintValue (in googletest-param-test-test.cc),...misterg2018-10-111-37/+1