Merge branch 'master' of https://github.com/google/googletest
Description
Description
Details
Details
- Committed
Scott Slack-Smith <deenderah@gmail.com> Nov 24 2017, 17:00 - Pushed
• trottet Dec 4 2019, 13:52 - Parents
- R9484:c958e26fd02d: *Silence false positive memory leaks reported by Microsoft's debug CRT*
R9484:d175c8bf823e: Merge pull request #1313 from aninf-wo/heth/fix-faq-stars-issue-1312 - Branches
- Unknown
- Tags
Merged Changes
Merged Changes
| Commit | Author | Details | Committed | |||
|---|---|---|---|---|---|---|
| d175c8bf823e | Gennadiy Civil/GitHub | Merge pull request #1313 from aninf-wo/heth/fix-faq-stars-issue-1312 | Oct 30 2017 | |||
| 43d6ad75bc4f | Gennadiy Civil/GitHub | Merge pull request #1308 from KindDragon/vs2017-ci | Oct 30 2017 | |||
| 8866af0386d7 | Herbert Thielen | remove markdown stars (bold) from code examples | Oct 29 2017 | |||
| b153bfd8f503 | Arkady Shapkin | Enable CI for VS2017 | Oct 25 2017 | |||
| 3121b2049e30 | Gennadiy Civil/GitHub | Merge pull request #1304 from m-gupta/gtestapifix | Oct 25 2017 | |||
| e93a15c5a59e | Gennadiy Civil/GitHub | Merge pull request #913 from Romain-Geissler/fix-gcc-misleading-indentation… | Oct 25 2017 | |||
| 060783b7d2b7 | m-gupta/GitHub | Merge branch 'master' into gtestapifix | Oct 25 2017 | |||
| 20e2de7d8bba | Romain Geissler | Remove gcc 6 misleading indentations. | Oct 25 2017 | |||
| 7684db32712e | Gennadiy Civil/GitHub | Merge pull request #1218 from KindDragon/vs-build-fix | Oct 25 2017 | |||
| 840c711e7bd7 | Arkady Shapkin | Fix gmock tests when std::unary_function unavailable | Oct 25 2017 | |||
| 2641b021fc2a | Arkadiy Shapkin/Arkady Shapkin | Fix tests with VS2015 and VS2017 | Oct 25 2017 | |||
| 77380cddf771 | Arkadiy Shapkin/Arkady Shapkin | Enable C++11 features for VS2015 and VS2017 | Oct 25 2017 | |||
| 6d0bb75c81bc | Gennadiy Civil/GitHub | Merge pull request #1139 from chehsunliu/master | Oct 24 2017 | |||
| 1beff241c359 | Manoj Gupta | googletest: Add GTEST_API_ attribute to ThreadLocal class. | Oct 20 2017 | |||
| c208d8df23d6 | Gennadiy Civil/GitHub | Merge branch 'master' into master | Oct 20 2017 | |||
| 69e48e92de43 | Gennadiy Civil/GitHub | Merge pull request #1300 from gennadiycivil/master | Oct 18 2017 | |||
| 48986f9d4c8e | Gennadiy Civil/GitHub | Merge branch 'master' into master | Oct 18 2017 | |||
| 54c2648bff0e | Gennadiy Civil | Workaround for Travis issue https://goo.gl/d5eV8o | Oct 18 2017 | |||
| 27be0dfb53a1 | Gennadiy Civil/GitHub | Merge pull request #1298 from google/revert-1297-master | Oct 18 2017 | |||
| 34aaf58c8b1b | Gennadiy Civil/GitHub | Revert "Workaround for Travis issue https://github.com/travis-ci/travis-ci/is…" | Oct 18 2017 | |||
| 5c9543547e5f | Gennadiy Civil/GitHub | Merge pull request #1297 from gennadiycivil/master | Oct 18 2017 | |||
| dfed97a69ac3 | Gennadiy Civil | Workaround for Travis issue https://github.com/travis-ci/travis-ci/issues/8552 | Oct 18 2017 | |||
| 3282f9ae018f | Gennadiy Civil/GitHub | Merge pull request #1288 from joealam/master | Oct 16 2017 | |||
| 963932e7f37b | Gennadiy Civil/GitHub | Merge pull request #1292 from DariuszOstolski/master | Oct 16 2017 | |||
| ecb1c3ddb6cf | Dariusz Ostolski | #1282: Doc typo fix | Oct 14 2017 | |||
| 4597ec587ca2 | Joe Alam | Updated README with information about C runtime dynamic/static linking issues… | Oct 8 2017 | |||
| 7b6561c56e35 | Gennadiy Civil/GitHub | Merge pull request #1275 from jwakely/pr/1273 | Oct 3 2017 | |||
| b70cf1a663ad | Jonathan Wakely | Use gender-neutral pronouns in comments and docs | Sep 27 2017 | |||
| f1a87d73fc60 | Gennadiy Civil/GitHub | Merge pull request #1249 from stkhapugin/master | Sep 24 2017 | |||
| 89f45180e02c | Gennadiy Civil/GitHub | Merge branch 'master' into master | Sep 23 2017 | |||
| bfc0ffc8a698 | Gennadiy Civil/GitHub | Merge pull request #1271 from google/revert-1245-2017_09_04_parametrized | Sep 21 2017 | |||
| d30a37e743e4 | Gennadiy Civil/GitHub | Revert "Allow macros inside of parametrized test names." | Sep 21 2017 | |||
| ff6796877fcb | Gennadiy Civil/GitHub | Merge pull request #1245 from sheepmaster/2017_09_04_parametrized | Sep 21 2017 | |||
| 43863938377a | Gennadiy Civil/GitHub | Merge pull request #1265 from bkircher/redundant-decl | Sep 20 2017 | |||
| cf512a099cd5 | stkhapugin@chromium.org | Swap reinterpret_cast for static_cast | Sep 19 2017 | |||
| d4af64ca1317 | Benjamin Kircher | Remove redundant declaration | Sep 16 2017 | |||
| deace2546ef4 | Gennadiy Civil/GitHub | Merge pull request #1259 from ly2048/patch-1 | Sep 15 2017 | |||
| b55abc3fe08a | ly2048/GitHub | Merge branch 'master' into patch-1 | Sep 15 2017 | |||
| b1dd47c278a7 | Gennadiy Civil/GitHub | Merge pull request #1255 from yursha/patch-1 | Sep 14 2017 | |||
| 9681b4c8e6aa | ly2048/GitHub | Add explicit `CMAKE_DEBUG_POSTFIX` option | Sep 14 2017 | |||
| 31b6155d7d46 | Alex Yursha/GitHub | Merge branch 'master' into patch-1 | Sep 14 2017 | |||
| 20e62ad24cc7 | Gennadiy Civil/GitHub | Merge pull request #1242 from DarthGandalf/expect | Sep 13 2017 | |||
| c9cf07a8ba4d | Alexey Sokolov | Make the failure messages from EXPECT_EQ and friends actually symmetric, | Sep 13 2017 | |||
| 834baf336231 | Alex Yursha/GitHub | Merge branch 'master' into patch-1 | Sep 12 2017 | |||
| 61330388862c | Gennadiy Civil/GitHub | Merge pull request #1227 from aninf-wo/hethi/unused-import | Sep 12 2017 | |||
| ecc5182dbd6e | Gennadiy Civil/GitHub | Merge pull request #1250 from aninf-wo/hethi/remove-linker-warning-on-non… | Sep 11 2017 | |||
| eb695b0f1162 | Gennadiy Civil/GitHub | Merge branch 'master' into hethi/unused-import | Sep 11 2017 | |||
| 3663d671708e | Gennadiy Civil/GitHub | Merge pull request #1203 from eidosmontreal/user_logger_instead_of_printf | Sep 11 2017 | |||
| 4f68ab5b84dd | Alex Yursha/GitHub | Fix ellipsis position in examples | Sep 9 2017 | |||
| def0b32119e1 | Gennadiy Civil/GitHub | Merge pull request #1254 from aninf-wo/hethi/cleanup-travis-environment | Sep 8 2017 |