Merge remote-tracking branch 'github_google/master' into master-github_frosteyes
- Conflicts:
- .gitignore
Description
Description
Details
Details
- Committed
Claus Stovgaard <claus.stovgaard@gmail.com> Aug 31 2017, 12:22 - Pushed
• trottet Dec 4 2019, 13:52 - Parents
- R9484:a6418a4dd19e: Merge remote-tracking branch 'github_google/master' into master-github_frosteyes
R9484:16bfba08e2c6: Merge pull request #1230 from aninf-wo/hethi/travis-unused-cmake - Branches
- Unknown
- Tags
Merged Changes
Merged Changes
| Commit | Author | Details | Committed | |||
|---|---|---|---|---|---|---|
| 16bfba08e2c6 | Gennadiy Civil/GitHub | Merge pull request #1230 from aninf-wo/hethi/travis-unused-cmake | Aug 31 2017 | |||
| 7f8fefabedf2 | Gennadiy Civil/GitHub | Merge pull request #1237 from sgraham/update-docs-3 | Aug 30 2017 | |||
| fa70b84ab51e | Gennadiy Civil/GitHub | Removed "Trivial" | Aug 30 2017 | |||
| c4e01616af01 | Gennadiy Civil/GitHub | removed internal link ( not allowed in OSS) | Aug 30 2017 | |||
| 0eb49f4d6b59 | Scott Graham | Note that it is preferable for Googlers to create a CL internally first | Aug 30 2017 | |||
| bb1c4af48702 | Gennadiy Civil/GitHub | Merge branch 'master' into master | Aug 30 2017 | |||
| c4ec2ac04de2 | Gennadiy Civil/GitHub | Merge branch 'master' into hethi/travis-unused-cmake | Aug 30 2017 | |||
| 5d431c650f9c | Gennadiy Civil/GitHub | Merge pull request #1236 from aninf-wo/hethi/issue-1087-fix-advancedguide | Aug 30 2017 | |||
| f0c72bfe09af | Herbert Thielen | fix SetUp/TearDownTestCase() in AdvancedGuide | Aug 30 2017 | |||
| c780e0e2c4e6 | Herbert Thielen/GitHub | Merge branch 'master' into hethi/travis-unused-cmake | Aug 30 2017 | |||
| 71e2858f3290 | Gennadiy Civil/GitHub | Merge pull request #1226 from aninf-wo/hethi/fix-typo | Aug 30 2017 | |||
| 5bd8e832177f | Gennadiy Civil/GitHub | Merge branch 'master' into hethi/fix-typo | Aug 30 2017 | |||
| 298cd5e9c423 | Gennadiy Civil/GitHub | Merge pull request #1233 from aninf-wo/hethi/typo-issue-1105 | Aug 30 2017 | |||
| b46755be30f9 | Gennadiy Civil/GitHub | Merge pull request #1229 from aninf-wo/hethi/typo-xUnit | Aug 30 2017 | |||
| 58fd184c7f7a | Gennadiy Civil/GitHub | Merge branch 'master' into hethi/typo-xUnit | Aug 30 2017 | |||
| c4126e0463a8 | Gennadiy Civil/GitHub | Merge pull request #1232 from aninf-wo/hethi/travis-reduce-buildjobs | Aug 30 2017 | |||
| 24ceb4f4f552 | Gennadiy Civil/GitHub | Merge pull request #1231 from aninf-wo/heth/travis-verbose-make | Aug 30 2017 | |||
| c3d1d3356046 | Scott Graham | Detect Fuchsia, and set GTEST_HAS_PTHREAD on GTEST_OS_FUCHSIA | Aug 29 2017 | |||
| bb8399e1baf9 | Herbert Thielen | use plural verb as mentioned in issue #1105 | Aug 29 2017 | |||
| 29c07aa9dbeb | Herbert Thielen | remove Yob's comma mentioned in issue #1105 | Aug 29 2017 | |||
| d33861dca6fa | Herbert Thielen | run combined build only | Aug 29 2017 | |||
| 4a451575895d | Herbert Thielen | switch on verbose make | Aug 29 2017 | |||
| 8364718500da | Herbert Thielen | remove non-existing gmock_build_samples switch | Aug 29 2017 | |||
| 30c1e00afbc0 | Gennadiy Civil/GitHub | Merge branch 'master' into hethi/typo-xUnit | Aug 29 2017 | |||
| 96f3745e73d5 | Gennadiy Civil/GitHub | Merge pull request #1189 from alyssawilk/flag-default | Aug 29 2017 | |||
| fe760e9c6d92 | Herbert Thielen | fix typo: xUnit | Aug 29 2017 | |||
| daaed2b6cb7b | Herbert Thielen | fix typo in comment and string (SetUpTestCase) | Aug 29 2017 | |||
| fa5d3b3845aa | Alyssa Wilk | Applying lint checks from upstream google3 | Aug 28 2017 | |||
| c00373320db8 | Alyssa Wilk | Merge branch 'refs/heads/master' into flag-default | Aug 28 2017 | |||
| b43bfcf49166 | Gennadiy Civil/GitHub | Merge pull request #1222 from KindDragon/vs-projects-fix3 | Aug 25 2017 | |||
| a7eeb6971fdf | Gennadiy Civil/GitHub | Merge branch 'master' into vs-projects-fix3 | Aug 25 2017 | |||
| f25921565bbf | Gennadiy Civil/GitHub | Merge pull request #1221 from KindDragon/vs-projects-fix2 | Aug 25 2017 | |||
| cb8ebf5c9a04 | Arkady Shapkin | Support x64 configuration for old VS2015 projects | Aug 25 2017 | |||
| 45287f3dffa4 | Arkady Shapkin | Remove gtest VS2005 projects | Aug 25 2017 | |||
| eabd5c908d27 | Gennadiy Civil/GitHub | Merge pull request #1186 from Dani-Hub/master | Aug 24 2017 | |||
| 87327b12e9b1 | Gennadiy Civil/GitHub | Merge branch 'master' into master | Aug 23 2017 | |||
| c38baf985831 | Gennadiy Civil/GitHub | Merge pull request #1219 from KindDragon/vs-projects-fix | Aug 23 2017 | |||
| ebc7b01d8956 | Daniel Krügler/GitHub | Merge branch 'master' into master | Aug 23 2017 | |||
| f4abce46093d | Gennadiy Civil/GitHub | Merge branch 'master' into vs-projects-fix | Aug 23 2017 | |||
| 863e02644b57 | Gennadiy Civil/GitHub | Merge pull request #1220 from romkatv/property-matcher | Aug 23 2017 | |||
| 88269cd365fa | Arkady Shapkin | Support x64 configuration for old VS2010 projects | Aug 23 2017 | |||
| f8514b8da353 | drgler | Merge branch 'master' of github.com:Dani-Hub/googletest | Aug 22 2017 | |||
| d93ce9d6fb8e | drgler | Merge branch 'master' of github.com:Dani-Hub/googletest | Aug 22 2017 | |||
| fa3bb1a77973 | drgler | Merge branch 'master' of github.com:Dani-Hub/googletest | Aug 22 2017 | |||
| 6404d45a9252 | drgler | Merge branch 'master' of github.com:Dani-Hub/googletest | Aug 22 2017 | |||
| 966b549c8803 | Roman Perepelitsa | Support ref-qualified member functions in Property(). | Aug 22 2017 | |||
| 8304d06199bd | Daniel Krügler/GitHub | Merge branch 'master' into master | Aug 21 2017 | |||
| 675686a139a7 | Gennadiy Civil/GitHub | Merge pull request #1206 from ShadowIce/methodname-in-exception | Aug 21 2017 | |||
| 1ee807965158 | Maurice Gilden | Remove unused variable | Aug 21 2017 | |||
| 3cf65b5d86d4 | Gennadiy Civil/GitHub | Added "explicit" as per compiler suggestion | Aug 20 2017 |