aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | | Merge branch 'master' into wrong-version-reportedGennadiy Civil2017-08-21118-27409/+1518
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | googlemock version must be changed as wellOlivier Clavel2017-02-131-2/+2
| * | | | | | | | | | | | Wrong version reported (1.7.0 should be 1.8.0)Olivier Clavel2017-02-131-1/+1
* | | | | | | | | | | | | Merge pull request #1235 from aninf-wo/hethi/issue-1175-cmake-build-typeGennadiy Civil2017-09-013-13/+24
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Merge branch 'master' into hethi/issue-1175-cmake-build-typeHerbert Thielen2017-08-311-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into hethi/issue-1175-cmake-build-typeGennadiy Civil2017-08-312-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into hethi/issue-1175-cmake-build-typeHerbert Thielen2017-08-314-3/+10
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | | Merge branch 'master' into hethi/issue-1175-cmake-build-typeHerbert Thielen2017-08-301-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|_|_|_|/ / | | |/| | | | | | | | | | | |
| * | | | | | | | | | | | | | create different python based tests for single and multi configuration build ...Herbert Thielen2017-08-301-9/+21
| * | | | | | | | | | | | | | Revert "ask cmake for per-configuration output subdir"Herbert Thielen2017-08-301-1/+1
| * | | | | | | | | | | | | | ask cmake for per-configuration output subdirHerbert Thielen2017-08-301-1/+1
| * | | | | | | | | | | | | | remove obsolete comment regarding python tests on linuxHerbert Thielen2017-08-301-2/+0
| * | | | | | | | | | | | | | use upper-case build typeHerbert Thielen2017-08-301-2/+2
| * | | | | | | | | | | | | | use build type set in .travis.ymlHerbert Thielen2017-08-301-0/+1
| | |_|_|_|_|_|_|_|_|_|_|/ / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge pull request #870 from KindDragon/mingw64-appveyourGennadiy Civil2017-09-011-36/+53
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into mingw64-appveyourArkady Shapkin2017-09-0110-13/+13
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / / |/| | | | | | | | | | | | | |
* | | | | | | | | | | | | | | Merge pull request #1241 from aninf-wo/hethi/issue-635-old-linksGennadiy Civil2017-08-3110-13/+13
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | change links from former code.google.com to current github repositoryHerbert Thielen2017-08-3110-13/+13
| | |_|_|_|/ / / / / / / / / | |/| | | | | | | | | | | |
| | * | | | | | | | | | | | Merge branch 'master' into mingw64-appveyourArkady Shapkin2017-08-314-5/+4
| | |\ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge pull request #1240 from aninf-wo/hethi/fix-faq-example-commentGennadiy Civil2017-08-311-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Merge branch 'master' into hethi/fix-faq-example-commentHerbert Thielen2017-08-312-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | |
* | | | | | | | | | | | | | Merge pull request #865 from frosteyes/masterGennadiy Civil2017-08-312-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Merge remote-tracking branch 'github_google/master' into master-github_frosteyesClaus Stovgaard2017-08-31159-28687/+3877
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Merge remote-tracking branch 'github_google/master' into master-github_frosteyesClaus Stovgaard2017-04-0510-19/+139
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | |_|_|_|_|_|_|_|/ / / / | | |/| | | | | | | | | | |
| * | | | | | | | | | | | | Moved the ignoring of *.pyc files to top level for also covering googlemock p...Claus Stovgaard2016-08-302-2/+2
| | | * | | | | | | | | | | fix example's commentHerbert Thielen2017-08-311-2/+2
| |_|/ / / / / / / / / / / |/| | | | | | | | | | | |
| | | * | | | | | | | | | AppVeyor MinGW-w64 test buildArkadiy Shapkin2017-08-311-36/+53
| | | | | | | | | | | | * Merge branch 'master' into masterChe-Hsun Liu2017-08-3168-1295/+2629
| | | | | | | | | | | | |\ | |_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | |
* | | | | | | | | | | | | 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
|/ / / / / / / / / / / / /