summaryrefslogtreecommitdiffstats
path: root/googletest
Commit message (Expand)AuthorAgeFilesLines
...
| | | * | | | | | 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
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | |_|_|_|_|_|_|_|_|/ / / / / | | | | |/| | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | | FIX: Compilation warning with GCC regarding a non-initialised member from Mut...tisi19882018-06-271-1/+1
| | | | |_|_|_|_|_|_|_|_|/ / / / / | | | |/| | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | Merge branch 'master' into cleanup-cmakeGennadiy Civil2018-08-15149-5066/+6134
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |_|_|_|_|_|_|/ / / / / / / | | | |/| | | | | | | | | | | | |
| | | * | | | | | | | | | | | | | Merge branch 'master' into cmake-binary-dir-fixrefs/pull/1734/headGennadiy Civil2018-08-1439-86/+53
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | more comments changesrefs/pull/1741/headGennadiy Civil2018-08-142-4/+2
| | | | * | | | | | | | | | | | | | more comments changesGennadiy Civil2018-08-142-2/+2
| | | | * | | | | | | | | | | | | | Comments changes, no functionality changes. Gennadiy Civil2018-08-1439-84/+53
| | | * | | | | | | | | | | | | | | Merge branch 'master' into cmake-binary-dir-fixGennadiy Civil2018-08-14105-258/+156
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / /
| | | | * | | | | | | | | | | | | | Comments changes, no functionality changesrefs/pull/1740/headGennadiy Civil2018-08-14100-201/+71
| | | | * | | | | | | | | | | | | | Merge branch 'master' into deprecaterefs/pull/1665/headGennadiy Civil2018-08-1414-122/+122
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | | * | | | | | | | | | | | | | Code formatting changes, clean up, no functionality changesrefs/pull/1738/headGennadiy Civil2018-08-142-3/+0
| | | | | * | | | | | | | | | | | | | Merge branch 'master' into masterrefs/pull/1733/headGennadiy Civil2018-08-141-1/+1
| | | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | |_|_|_|_|_|/ / / / / / / | | | | | | |/| | | | | | | | | | | |
| | | | | * | | | | | | | | | | | | | formatting custom/README.mdGennadiy Civil2018-08-141-10/+10
| | | | | * | | | | | | | | | | | | | formatting for new READMEsGennadiy Civil2018-08-131-22/+22
| | | | | * | | | | | | | | | | | | | Move instructions into custom/README filesGennadiy Civil2018-08-134-45/+60
| | | | * | | | | | | | | | | | | | | Merge branch 'master' into deprecateLoo Rong Jie2018-08-0917-71/+115
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |_|_|_|_|_|_|/ / / / / / / | | | | | |/| | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | Merge branch 'master' into deprecateGennadiy Civil2018-08-0361-347/+864
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into deprecateGennadiy Civil2018-07-3025-1/+44
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |_|_|_|_|_|_|/ / / / / / / / | | | | | |/| | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | Merge branch 'master' into deprecateGennadiy Civil2018-07-264-18/+11
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into deprecateGennadiy Civil2018-07-201-4/+0
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | |_|_|_|_|_|_|_|/ / / / / / / / | | | | | |/| | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | | | Merge branch 'master' into deprecateGennadiy Civil2018-07-194-1918/+1719
| | | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | | * | | | | | | | | | | | | | | | | | Disable MSVC function deprecation when using ClangLoo Rong Jie2018-07-134-8/+24
| | | * | | | | | | | | | | | | | | | | | | Change location of generated pkg-config files from CMAKE_BINARY_DIR to gmock/...Elias Daler2018-08-131-3/+3
| | | | |_|_|_|_|_|_|/ / / / / / / / / / / | | | |/| | | | | | | | | | | | | | | | |
| | * | | | | | | | | | | | | | | | | | | Clean up cache non-advanced variable for subprojectHenry Fredrick Schreiner2018-04-051-5/+20
| * | | | | | | | | | | | | | | | | | | | Merge branch 'master' into fix_death_test_child_mingw_wer_issue1116Tanzinul Islam2018-08-0171-4392/+4880
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into fix_death_test_child_mingw_wer_issue1116Tanzinul Islam2018-05-1310-22/+273
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into fix_death_test_child_mingw_wer_issue1116Tanzinul Islam2018-05-056-34/+50
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into fix_death_test_child_mingw_wer_issue1116Tanzinul Islam2018-04-0121-243/+474
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \