Merge branch 'master' into support_xboxone
Description
Description
Details
Details
- Committed
GitHub <noreply@github.com> Sep 6 2017, 20:29 - Pushed
• trottet Dec 4 2019, 13:52 - Parents
- R9484:a1c332cdbe89: Merge branch 'master' into support_xboxone
R9484:8a3ccc3ee363: Merge pull request #1247 from aninf-wo/hethi/enable-parallel-builds - Branches
- Unknown
- Tags
Merged Changes
Merged Changes
| Commit | Author | Details | Committed | |||
|---|---|---|---|---|---|---|
| 8a3ccc3ee363 | Gennadiy Civil/GitHub | Merge pull request #1247 from aninf-wo/hethi/enable-parallel-builds | Sep 6 2017 | |||
| 857ddeadebe4 | Gennadiy Civil/GitHub | Merge pull request #975 from LebedevRI/respect-option | Sep 5 2017 | |||
| fe97312e24ef | Herbert Thielen | limit processors to use in Travis build to 4 | Sep 4 2017 | |||
| d96a038e8b2b | Herbert Thielen | set MAKEFLAGS to use multiple processors on Travis CI | Sep 4 2017 | |||
| 7c6353d29a14 | Gennadiy Civil/GitHub | Merge pull request #900 from Gallaecio/patch-1 | Sep 1 2017 | |||
| 1a62d1b08806 | Roman Lebedev | CMake: use threads if allowed and found, not just if found. | Sep 1 2017 | |||
| 52b6ca3428ee | Gennadiy Civil/GitHub | Merge pull request #783 from tobbi/cppcheck_perf_fixes | Sep 1 2017 | |||
| e4f6c0b358a4 | Gennadiy Civil/GitHub | Merge pull request #1011 from zeitounator/wrong-version-reported | Sep 1 2017 | |||
| b3a1f87f0c5f | Gennadiy Civil/GitHub | Merge pull request #1235 from aninf-wo/hethi/issue-1175-cmake-build-type | Sep 1 2017 | |||
| 69e794ca75e6 | Gennadiy Civil/GitHub | Merge pull request #870 from KindDragon/mingw64-appveyour | Sep 1 2017 | |||
| 633488a76325 | Arkady Shapkin/GitHub | Merge branch 'master' into mingw64-appveyour | Sep 1 2017 | |||
| 836c194a8102 | Gennadiy Civil/GitHub | Merge pull request #1241 from aninf-wo/hethi/issue-635-old-links | Sep 1 2017 | |||
| 8282229d4f9d | Arkady Shapkin/GitHub | Merge branch 'master' into mingw64-appveyour | Aug 31 2017 | |||
| 2a720ac1bbd6 | Herbert Thielen/GitHub | Merge branch 'master' into hethi/issue-1175-cmake-build-type | Aug 31 2017 | |||
| e033d8c73de8 | Herbert Thielen | change links from former code.google.com to current github repository | Aug 31 2017 | |||
| 92e920730dae | Gennadiy Civil/GitHub | Merge pull request #1240 from aninf-wo/hethi/fix-faq-example-comment | Aug 31 2017 | |||
| 7f27d8bdd1f4 | Gennadiy Civil/GitHub | Merge branch 'master' into hethi/issue-1175-cmake-build-type | Aug 31 2017 | |||
| 84bd72ba3cc7 | Herbert Thielen/GitHub | Merge branch 'master' into hethi/fix-faq-example-comment | Aug 31 2017 | |||
| 14cf7f574a4f | Herbert Thielen | fix example's comment | Aug 31 2017 | |||
| a430e9c176bd | Gennadiy Civil/GitHub | Merge pull request #865 from frosteyes/master | Aug 31 2017 | |||
| 34355c0e870e | Claus Stovgaard | Merge remote-tracking branch 'github_google/master' into master-github_frosteyes | Aug 31 2017 | |||
| d6c46ebd04e2 | Herbert Thielen/GitHub | Merge branch 'master' into hethi/issue-1175-cmake-build-type | Aug 31 2017 | |||
| 16bfba08e2c6 | Gennadiy Civil/GitHub | Merge pull request #1230 from aninf-wo/hethi/travis-unused-cmake | Aug 31 2017 | |||
| 5dde668e0931 | Arkadiy Shapkin/Arkady Shapkin | AppVeyor MinGW-w64 test build | Aug 31 2017 | |||
| 7f8fefabedf2 | Gennadiy Civil/GitHub | Merge pull request #1237 from sgraham/update-docs-3 | Aug 30 2017 | |||
| cfcc89a84a6f | Herbert Thielen/GitHub | Merge branch 'master' into hethi/issue-1175-cmake-build-type | 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 | |||
| 9ba7946bde63 | Herbert Thielen | create different python based tests for single and multi configuration build… | Aug 30 2017 | |||
| c4ec2ac04de2 | Gennadiy Civil/GitHub | Merge branch 'master' into hethi/travis-unused-cmake | Aug 30 2017 | |||
| 47ad2993b682 | Herbert Thielen | Revert "ask cmake for per-configuration output subdir" | Aug 30 2017 | |||
| 5d431c650f9c | Gennadiy Civil/GitHub | Merge pull request #1236 from aninf-wo/hethi/issue-1087-fix-advancedguide | Aug 30 2017 | |||
| 73d58dd4c838 | Herbert Thielen | ask cmake for per-configuration output subdir | Aug 30 2017 | |||
| 7529c8aa05c2 | Herbert Thielen | remove obsolete comment regarding python tests on linux | Aug 30 2017 | |||
| f0c72bfe09af | Herbert Thielen | fix SetUp/TearDownTestCase() in AdvancedGuide | Aug 30 2017 | |||
| dae044d4b986 | Herbert Thielen | use upper-case build type | Aug 30 2017 | |||
| cc246ecb5675 | Herbert Thielen | use build type set in .travis.yml | 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 |