aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #1230 from aninf-wo/hethi/travis-unused-cmakeGennadiy Civil2017-08-301-1/+0
|\
| * Merge branch 'master' into hethi/travis-unused-cmakeGennadiy Civil2017-08-301-2/+2
| |\
| * \ Merge branch 'master' into hethi/travis-unused-cmakeHerbert Thielen2017-08-305-13/+9
| |\ \
| * | | remove non-existing gmock_build_samples switchHerbert Thielen2017-08-291-1/+0
* | | | Merge pull request #1237 from sgraham/update-docs-3Gennadiy Civil2017-08-303-2/+10
|\ \ \ \ | |_|_|/ |/| | |
| * | | Removed "Trivial" Gennadiy Civil2017-08-301-1/+1
| * | | removed internal link ( not allowed in OSS)Gennadiy Civil2017-08-301-1/+1
| * | | Note that it is preferable for Googlers to create a CL internally firstScott Graham2017-08-301-0/+4
| * | | Merge branch 'master' into masterGennadiy Civil2017-08-306-15/+11
| |\ \ \ | |/ / / |/| | |
* | | | Merge pull request #1236 from aninf-wo/hethi/issue-1087-fix-advancedguideGennadiy Civil2017-08-301-2/+2
|\ \ \ \ | |_|_|/ |/| | |
| * | | fix SetUp/TearDownTestCase() in AdvancedGuideHerbert Thielen2017-08-301-2/+2
|/ / /
* | | Merge pull request #1226 from aninf-wo/hethi/fix-typoGennadiy Civil2017-08-301-2/+2
|\ \ \
| * \ \ Merge branch 'master' into hethi/fix-typoGennadiy Civil2017-08-2910-14/+139
| |\ \ \ | |/ / / |/| | |
* | | | Merge pull request #1233 from aninf-wo/hethi/typo-issue-1105Gennadiy Civil2017-08-291-2/+2
|\ \ \ \
| * | | | use plural verb as mentioned in issue #1105Herbert Thielen2017-08-291-1/+1
| * | | | remove Yob's comma mentioned in issue #1105Herbert Thielen2017-08-291-1/+1
| | |_|/ | |/| |
* | | | Merge pull request #1229 from aninf-wo/hethi/typo-xUnitGennadiy Civil2017-08-291-1/+1
|\ \ \ \
| * \ \ \ Merge branch 'master' into hethi/typo-xUnitGennadiy Civil2017-08-292-8/+4
| |\ \ \ \ | |/ / / / |/| | | |
* | | | | Merge pull request #1232 from aninf-wo/hethi/travis-reduce-buildjobsGennadiy Civil2017-08-292-8/+4
|\ \ \ \ \
| * | | | | run combined build onlyHerbert Thielen2017-08-292-8/+4
* | | | | | Merge pull request #1231 from aninf-wo/heth/travis-verbose-makeGennadiy Civil2017-08-291-3/+3
|\| | | | | | |_|/ / / |/| | | |
| * | | | switch on verbose makeHerbert Thielen2017-08-291-3/+3
|/ / / /
| * | | Merge branch 'master' into hethi/typo-xUnitGennadiy Civil2017-08-296-3/+132
| |\ \ \ | |/ / / |/| | |
| * | | fix typo: xUnitHerbert Thielen2017-08-291-1/+1
| | * | fix typo in comment and string (SetUpTestCase)Herbert Thielen2017-08-291-2/+2
| |/ /
| | * Detect Fuchsia, and set GTEST_HAS_PTHREAD on GTEST_OS_FUCHSIAScott Graham2017-08-292-2/+6
| |/ |/|
* | Merge pull request #1189 from alyssawilk/flag-defaultGennadiy Civil2017-08-296-3/+132
|\ \ | |/ |/|
| * Applying lint checks from upstream google3Alyssa Wilk2017-08-281-4/+7
| * Merge branch 'refs/heads/master' into flag-defaultAlyssa Wilk2017-08-28115-28062/+2959
| |\ | |/ |/|
* | Merge pull request #1222 from KindDragon/vs-projects-fix3Gennadiy Civil2017-08-254-7/+216
|\ \
| * \ Merge branch 'master' into vs-projects-fix3Gennadiy Civil2017-08-2410-1222/+0
| |\ \ | |/ / |/| |
* | | Merge pull request #1221 from KindDragon/vs-projects-fix2Gennadiy Civil2017-08-2410-1222/+0
|\ \ \
| * | | Remove gtest VS2005 projectsArkady Shapkin2017-08-2510-1222/+0
|/ / /
| * / Support x64 configuration for old VS2015 projectsArkady Shapkin2017-08-254-7/+216
|/ /
* | Merge pull request #1186 from Dani-Hub/masterGennadiy Civil2017-08-244-8/+74
|\ \
| * \ Merge branch 'master' into masterGennadiy Civil2017-08-2323-22/+1879
| |\ \ | |/ / |/| |
* | | Merge pull request #1219 from KindDragon/vs-projects-fixGennadiy Civil2017-08-2323-22/+1879
|\ \ \
| * \ \ Merge branch 'master' into vs-projects-fixGennadiy Civil2017-08-222-8/+47
| |\ \ \ | |/ / / |/| | |
| * | | Support x64 configuration for old VS2010 projectsArkady Shapkin2017-08-2323-22/+1879
| | * | Merge branch 'master' into masterDaniel Krügler2017-08-232-8/+47
| | |\ \ | |_|/ / |/| | |
* | | | Merge pull request #1220 from romkatv/property-matcherGennadiy Civil2017-08-222-8/+47
|\ \ \ \ | |/ / / |/| | |
| * | | Support ref-qualified member functions in Property().Roman Perepelitsa2017-08-222-8/+47
|/ / /
| * | Merge branch 'master' of github.com:Dani-Hub/googletestdrgler2017-08-220-0/+0
| |\ \
| | * \ Merge branch 'master' of github.com:Dani-Hub/googletestdrgler2017-08-2293-26841/+845
| | |\ \
| * | \ \ Merge branch 'master' of github.com:Dani-Hub/googletestdrgler2017-08-2294-26841/+847
| |\ \ \ \ | | |/ / / | |/| / / | | |/ /
| | * | Merge branch 'master' into masterDaniel Krügler2017-08-2193-26841/+845
| | |\ \ | |_|/ / |/| | |
* | | | Merge pull request #1206 from ShadowIce/methodname-in-exceptionGennadiy Civil2017-08-212-1/+24
|\ \ \ \
| * | | | Remove unused variableMaurice Gilden2017-08-211-1/+0
| * | | | Added "explicit" as per compiler suggestionGennadiy Civil2017-08-201-1/+1
| * | | | Proposing these changes, please reviewGennadiy Civil2017-08-201-12/+9
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-23 01:04:28 +0000