Merge branch 'master' into josh/fix_scoped_class2
Description
Description
Details
Details
- Committed
GitHub <noreply@github.com> Dec 12 2017, 18:36 - Pushed
• trottet Dec 4 2019, 13:52 - Parents
- R9484:cf85f56b2159: Merge branch 'master' into josh/fix_scoped_class2
R9484:0fe96607d85c: Merge pull request #1355 from coryan/blaze-build-travis - Branches
- Unknown
- Tags
Merged Changes
Merged Changes
| Commit | Author | Details | Committed | |||
|---|---|---|---|---|---|---|
| 0fe96607d85c | Gennadiy Civil/GitHub | Merge pull request #1355 from coryan/blaze-build-travis | Dec 11 2017 | |||
| ed811dc79feb | Gennadiy Civil/GitHub | Merge branch 'master' into blaze-build-travis | Dec 11 2017 | |||
| 59202300f1a7 | Gennadiy Civil/GitHub | Merge pull request #1333 from sam-lunt/use-system-includes | Dec 9 2017 | |||
| bc3320b7f1da | Carlos O'Ryan | Implement bazel-based builds in Travis. | Dec 9 2017 | |||
| 10ef1d9a1e7e | Gennadiy Civil/GitHub | Merge branch 'master' into use-system-includes | Dec 8 2017 | |||
| cc372a071bb4 | Gennadiy Civil/GitHub | Merge pull request #1340 from coryan/fix-googlemock-test-build-file | Dec 8 2017 | |||
| cf3adad594b6 | Carlos O'Ryan/Carlos O'Ryan | Add licenses() directive for googlemock/tests. | Dec 8 2017 | |||
| 4d1f930af878 | Gennadiy Civil/GitHub | Merge pull request #1345 from coryan/fix-travis-build-macOS | Dec 8 2017 | |||
| efc6abae678f | Gennadiy Civil/GitHub | Merge branch 'master' into fix-travis-build-macOS | Dec 8 2017 | |||
| 887a6c642006 | Gennadiy Civil/GitHub | Merge pull request #1348 from wmamrak/master | Dec 8 2017 | |||
| 57bb0bbbf80b | Wojciech Mamrak/GitHub | Remove C4996 warning in VS2017 | Dec 7 2017 | |||
| 3464f76e890a | Wojciech Mamrak/GitHub | Improved description of VS std::tuple support | Dec 7 2017 | |||
| 8d9d6bb0a375 | Wojciech Mamrak/GitHub | Improved description of VS std::tuple support | Dec 7 2017 | |||
| 4aa05bd4ffb8 | Carlos O'Ryan/Carlos O'Ryan | Only switch to g++-4.9 on Linux. | Dec 7 2017 | |||
| a868e618c060 | Gennadiy Civil/GitHub | Merge pull request #1225 from brian-peloton/master | Dec 5 2017 | |||
| 9e236748fb7c | Gennadiy Civil/GitHub | Merge branch 'master' into master | Dec 1 2017 | |||
| ce919c3ddf80 | Gennadiy Civil/GitHub | Merge branch 'master' into use-system-includes | Dec 1 2017 | |||
| 247a3d8e5e5d | Gennadiy Civil/GitHub | Merge pull request #1324 from whame/master | Dec 1 2017 | |||
| f46bd00e369e | Sam Lunt/Sam Lunt | make includes system | Nov 28 2017 | |||
| 82447f23be94 | whame | Fixes issue #826 by treating MinGW as "non-Windows" when determining colored… | Nov 7 2017 | |||
| 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 |