Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | | | Merge remote-tracking branch 'github_google/master' into master-github_frosteyes | Claus Stovgaard | 2017-08-31 | 159 | -28687/+3877 | |
| |\ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | ||||||
| * | | | | | | | | | Merge remote-tracking branch 'github_google/master' into master-github_frosteyes | Claus Stovgaard | 2017-04-05 | 10 | -19/+139 | |
| |\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Moved the ignoring of *.pyc files to top level for also covering googlemock p... | Claus Stovgaard | 2016-08-30 | 2 | -2/+2 | |
| | | * | | | | | | | | fix example's comment | Herbert Thielen | 2017-08-31 | 1 | -2/+2 | |
| |_|/ / / / / / / / |/| | | | | | | | | | ||||||
* | | | | | | | | | | Merge pull request #1230 from aninf-wo/hethi/travis-unused-cmake | Gennadiy Civil | 2017-08-30 | 1 | -1/+0 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'master' into hethi/travis-unused-cmake | Gennadiy Civil | 2017-08-30 | 1 | -2/+2 | |
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / | | |/| | | | | | | | | ||||||
| * | | | | | | | | | | Merge branch 'master' into hethi/travis-unused-cmake | Herbert Thielen | 2017-08-30 | 5 | -13/+9 | |
| |\ \ \ \ \ \ \ \ \ \ | | | |_|_|_|/ / / / / | | |/| | | | | | | | | ||||||
| * | | | | | | | | | | remove non-existing gmock_build_samples switch | Herbert Thielen | 2017-08-29 | 1 | -1/+0 | |
| | | | | | * | | | | | AppVeyor MinGW-w64 test build | Arkadiy Shapkin | 2017-08-31 | 1 | -36/+53 | |
| |_|_|_|_|/ / / / / |/| | | | | | | | | | ||||||
* | | | | | | | | | | Merge pull request #1237 from sgraham/update-docs-3 | Gennadiy Civil | 2017-08-30 | 3 | -2/+10 | |
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | | | ||||||
| * | | | | | | | | | Removed "Trivial" | Gennadiy Civil | 2017-08-30 | 1 | -1/+1 | |
| * | | | | | | | | | removed internal link ( not allowed in OSS) | Gennadiy Civil | 2017-08-30 | 1 | -1/+1 | |
| * | | | | | | | | | Note that it is preferable for Googlers to create a CL internally first | Scott Graham | 2017-08-30 | 1 | -0/+4 | |
| * | | | | | | | | | Merge branch 'master' into master | Gennadiy Civil | 2017-08-30 | 6 | -15/+11 | |
| |\ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | ||||||
* | | | | | | | | | | Merge pull request #1236 from aninf-wo/hethi/issue-1087-fix-advancedguide | Gennadiy Civil | 2017-08-30 | 1 | -2/+2 | |
|\ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / |/| | | | | | | | | | ||||||
| * | | | | | | | | | fix SetUp/TearDownTestCase() in AdvancedGuide | Herbert Thielen | 2017-08-30 | 1 | -2/+2 | |
|/ / / / / / / / / | ||||||
* | | | | | | | | | Merge pull request #1226 from aninf-wo/hethi/fix-typo | Gennadiy Civil | 2017-08-30 | 1 | -2/+2 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ | Merge branch 'master' into hethi/fix-typo | Gennadiy Civil | 2017-08-29 | 10 | -14/+139 | |
| |\ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | ||||||
* | | | | | | | | | | Merge pull request #1233 from aninf-wo/hethi/typo-issue-1105 | Gennadiy Civil | 2017-08-29 | 1 | -2/+2 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | use plural verb as mentioned in issue #1105 | Herbert Thielen | 2017-08-29 | 1 | -1/+1 | |
| * | | | | | | | | | | remove Yob's comma mentioned in issue #1105 | Herbert Thielen | 2017-08-29 | 1 | -1/+1 | |
| | |_|/ / / / / / / | |/| | | | | | | | | ||||||
* | | | | | | | | | | Merge pull request #1229 from aninf-wo/hethi/typo-xUnit | Gennadiy Civil | 2017-08-29 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ \ | Merge branch 'master' into hethi/typo-xUnit | Gennadiy Civil | 2017-08-29 | 2 | -8/+4 | |
| |\ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | | ||||||
* | | | | | | | | | | | Merge pull request #1232 from aninf-wo/hethi/travis-reduce-buildjobs | Gennadiy Civil | 2017-08-29 | 2 | -8/+4 | |
|\ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | run combined build only | Herbert Thielen | 2017-08-29 | 2 | -8/+4 | |
* | | | | | | | | | | | | Merge pull request #1231 from aninf-wo/heth/travis-verbose-make | Gennadiy Civil | 2017-08-29 | 1 | -3/+3 | |
|\| | | | | | | | | | | | |_|/ / / / / / / / / |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | switch on verbose make | Herbert Thielen | 2017-08-29 | 1 | -3/+3 | |
|/ / / / / / / / / / | ||||||
| * | | | | | | | | | Merge branch 'master' into hethi/typo-xUnit | Gennadiy Civil | 2017-08-29 | 6 | -3/+132 | |
| |\ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | ||||||
| * | | | | | | | | | fix typo: xUnit | Herbert Thielen | 2017-08-29 | 1 | -1/+1 | |
| | * | | | | | | | | fix typo in comment and string (SetUpTestCase) | Herbert Thielen | 2017-08-29 | 1 | -2/+2 | |
| |/ / / / / / / / | ||||||
| | * / / / / / / | Detect Fuchsia, and set GTEST_HAS_PTHREAD on GTEST_OS_FUCHSIA | Scott Graham | 2017-08-29 | 2 | -2/+6 | |
| |/ / / / / / / |/| | | | | | | | ||||||
* | | | | | | | | Merge pull request #1189 from alyssawilk/flag-default | Gennadiy Civil | 2017-08-29 | 6 | -3/+132 | |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | ||||||
| * | | | | | | | Applying lint checks from upstream google3 | Alyssa Wilk | 2017-08-28 | 1 | -4/+7 | |
| * | | | | | | | Merge branch 'refs/heads/master' into flag-default | Alyssa Wilk | 2017-08-28 | 115 | -28062/+2959 | |
| |\ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | ||||||
* | | | | | | | | Merge pull request #1222 from KindDragon/vs-projects-fix3 | Gennadiy Civil | 2017-08-25 | 4 | -7/+216 | |
|\ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ | Merge branch 'master' into vs-projects-fix3 | Gennadiy Civil | 2017-08-24 | 10 | -1222/+0 | |
| |\ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | ||||||
* | | | | | | | | | Merge pull request #1221 from KindDragon/vs-projects-fix2 | Gennadiy Civil | 2017-08-24 | 10 | -1222/+0 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | Remove gtest VS2005 projects | Arkady Shapkin | 2017-08-25 | 10 | -1222/+0 | |
|/ / / / / / / / / | ||||||
| * / / / / / / / | Support x64 configuration for old VS2015 projects | Arkady Shapkin | 2017-08-25 | 4 | -7/+216 | |
|/ / / / / / / / | ||||||
* | | | | | | | | Merge pull request #1186 from Dani-Hub/master | Gennadiy Civil | 2017-08-24 | 4 | -8/+74 | |
|\ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ | Merge branch 'master' into master | Gennadiy Civil | 2017-08-23 | 23 | -22/+1879 | |
| |\ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | ||||||
* | | | | | | | | | Merge pull request #1219 from KindDragon/vs-projects-fix | Gennadiy Civil | 2017-08-23 | 23 | -22/+1879 | |
|\ \ \ \ \ \ \ \ \ | ||||||
| * \ \ \ \ \ \ \ \ | Merge branch 'master' into vs-projects-fix | Gennadiy Civil | 2017-08-22 | 2 | -8/+47 | |
| |\ \ \ \ \ \ \ \ \ | |/ / / / / / / / / |/| | | | | | | | | | ||||||
| * | | | | | | | | | Support x64 configuration for old VS2010 projects | Arkady Shapkin | 2017-08-23 | 23 | -22/+1879 | |
| | |_|_|_|_|/ / / | |/| | | | | | | | ||||||
| | * | | | | | | | Merge branch 'master' into master | Daniel Krügler | 2017-08-23 | 2 | -8/+47 | |
| | |\ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | | | ||||||
* | | | | | | | | | Merge pull request #1220 from romkatv/property-matcher | Gennadiy Civil | 2017-08-22 | 2 | -8/+47 | |
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | | ||||||
| * | | | | | | | | Support ref-qualified member functions in Property(). | Roman Perepelitsa | 2017-08-22 | 2 | -8/+47 | |
|/ / / / / / / / | ||||||
| * | | | | | | | Merge branch 'master' of github.com:Dani-Hub/googletest | drgler | 2017-08-22 | 0 | -0/+0 | |
| |\ \ \ \ \ \ \ | ||||||
| | * \ \ \ \ \ \ | Merge branch 'master' of github.com:Dani-Hub/googletest | drgler | 2017-08-22 | 93 | -26841/+845 | |
| | |\ \ \ \ \ \ \ | ||||||
| * | \ \ \ \ \ \ \ | Merge branch 'master' of github.com:Dani-Hub/googletest | drgler | 2017-08-22 | 94 | -26841/+847 | |
| |\ \ \ \ \ \ \ \ \ | | |/ / / / / / / / | |/| / / / / / / / | | |/ / / / / / / |