summaryrefslogtreecommitdiffstats
path: root/googletest
Commit message (Expand)AuthorAgeFilesLines
* Fix broken FAQ link in primer.mdrefs/pull/1794/headSteven Santos Erenst2018-08-291-1/+1
* Merge branch 'master' into fix-1764_CMake-errors-in-googlemockrefs/pull/1769/headGennadiy Civil2018-08-274-73/+333
|\
| * Merge 72a2836945e7a3dcee0730166704587e10bf64ee into 1d9a1912e7f42e8ae66ea365b...David Schuldenfrei2018-08-274-73/+333
* | Use `$<INSTALL_PREFIX>` in `target_include_directories`Dakota Hawkins2018-08-241-2/+2
|/
* Merge branch 'master' into issue_1735refs/pull/1767/headGennadiy Civil2018-08-241-7/+7
|\
| * Googletest exportrefs/pull/1779/headmisterg2018-08-231-7/+7
| * Googletest exportsrz_zumix2018-08-233-61/+23
| * Googletest exportsrz_zumix2018-08-233-23/+61
* | Merge branch 'master' into issue_1735Jacob Schloss2018-08-22126-394/+448
|\ \ | |/
| * Install CMake export filesrefs/pull/1338/headStefano Soffia2018-08-223-49/+72
| * Improve CMake exported targets.refs/pull/1682/headDakota Hawkins2018-08-211-4/+27
| * googletest exportmisterg2018-08-208-1/+46
| * googletest exportmisterg2018-08-203-0/+18
| * Merge pull request #1754 from vkotovv/docs-advanced-broken-linksGennadiy Civil2018-08-201-5/+5
| |\
| | * docs: fix more broken links to sections in Advanced guiderefs/pull/1754/headVadim Kotov2018-08-201-3/+3
| | * docs: fixed broken references to sections in Advanced guideVadim Kotov2018-08-201-2/+2
| * | Merge branch 'master' into fix_death_test_child_mingw_wer_issue1116refs/pull/1120/headGennadiy Civil2018-08-201-0/+17
| |\ \ | | |/
| | * Merge branch 'master' into fix-argcrefs/pull/1347/headGennadiy Civil2018-08-193-8/+14
| | |\
| | * | Minor formatting/style changesGennadiy Civil2018-08-171-8/+7
| | * | Merge branch 'master' into fix-argcConor Burgess2018-08-17152-5308/+8145
| | |\ \
| | * \ \ Merge branch 'master' into fix-argcConor Burgess2018-02-1244-288/+1066
| | |\ \ \
| | * \ \ \ Merge branch 'master' into fix-argcConor Burgess2018-01-1256-665/+336
| | |\ \ \ \
| | * \ \ \ \ Merge branch 'master' into fix-argcGennadiy Civil2017-12-082-0/+5
| | |\ \ \ \ \
| | * | | | | | Fix location of `_NSGetArgv` correction.Conor Burgess2017-12-071-10/+11
| | * | | | | | Fix value pointed to by `_NSGetArgc()` on macOSConor Burgess2017-12-071-0/+16
| * | | | | | | Merge branch 'master' into fix_death_test_child_mingw_wer_issue1116Gennadiy Civil2018-08-182-4/+10
| |\ \ \ \ \ \ \ | | | |_|_|_|_|/ | | |/| | | | |
| | * | | | | | Merge pull request #1612 from wkaluza/fix-msvc-d9025-warningGennadiy Civil2018-08-181-0/+5
| | |\ \ \ \ \ \
| | | * \ \ \ \ \ Merge branch 'master' into fix-msvc-d9025-warningrefs/pull/1612/headGennadiy Civil2018-08-17140-2707/+3373
| | | |\ \ \ \ \ \ | | | | | |_|_|_|/ | | | | |/| | | |
| | | * | | | | | Remove default /EHsc compiler flagWojciech Kaluza2018-07-111-0/+5
| | * | | | | | | Merge branch 'master' into patch-1refs/pull/1652/headGennadiy Civil2018-08-171-4/+4
| | |\ \ \ \ \ \ \
| | * | | | | | | | FormattingGennadiy Civil2018-08-171-4/+5
| | * | | | | | | | Merge branch 'master' into patch-1Gennadiy Civil2018-08-173-8/+65
| | |\ \ \ \ \ \ \ \ | | | | |_|/ / / / / | | | |/| | | | | |
| | * | | | | | | | Merge branch 'master' into patch-1Gennadiy Civil2018-08-15141-3000/+3652
| | |\ \ \ \ \ \ \ \
| | * | | | | | | | | Cast the tr1::tuple_element template parameter to intmedithe2018-07-091-2/+2
| * | | | | | | | | | Merge branch 'master' into fix_death_test_child_mingw_wer_issue1116Tanzinul Islam2018-08-17130-771/+1144
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|/ / / / / / | | |/| | | | | | | |
| | * | | | | | | | | std references shouldn't be fully qualifiedrefs/pull/1748/headVadim Berezniker2018-08-171-4/+4
| | | |_|/ / / / / / | | |/| | | | | | |
| | * | | | | | | | Merge branch 'master' into cleanup-cmakerefs/pull/1546/headHenry Schreiner2018-08-172-4/+46
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | Small formatting changeGennadiy Civil2018-08-161-2/+2
| | | * | | | | | | | Merge branch 'master' into masterGennadiy Civil2018-08-161-2/+44
| | | |\ \ \ \ \ \ \ \
| | | | * | | | | | | | Small style changes. refs/pull/1142/headGennadiy Civil2018-08-161-14/+8
| | | | * | | | | | | | Merge branch 'master' into masterGennadiy Civil2018-08-16157-6020/+9256
| | | | |\ \ \ \ \ \ \ \ | | | | | | |/ / / / / / | | | | | |/| | | | | |
| | | | * | | | | | | | Merge branch 'master' of https://github.com/google/googletestScott Slack-Smith2017-11-24101-13383/+2503
| | | | |\ \ \ \ \ \ \ \
| | | | * | | | | | | | | *Silence false positive memory leaks reported by Microsoft's debug CRT*Scott Slack-Smith2017-06-301-2/+50
| | | * | | | | | | | | | Merge branch 'master' into masterGennadiy Civil2018-08-15123-346/+211
| | | |\ \ \ \ \ \ \ \ \ \ | | | | | |_|/ / / / / / / | | | | |/| | | | | | | |
| | | * | | | | | | | | | Merge branch 'master' into mastertisi19882018-08-149-74/+62
| | | |\ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into mastertisi19882018-08-0917-69/+113
| | | |\ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into mastertisi19882018-08-0761-349/+866
| | | |\ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into mastertisi19882018-08-0128-19/+55
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into mastertisi19882018-07-2313-1958/+2117
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into mastertisi19882018-07-123-320/+363
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|_|_|/ / / / / | | | | |/| | | | | | | | | | | | |