Homec4science

Merge branch 'master' into mingw64-appveyour

Authored by Arkady Shapkin <arkady.shapkin@gmail.com> on Aug 31 2017, 22:05.

Description

Merge branch 'master' into mingw64-appveyour

Event Timeline

GitHub <noreply@github.com> committed R9484:8282229d4f9d: Merge branch 'master' into mingw64-appveyour (authored by Arkady Shapkin <arkady.shapkin@gmail.com>).Aug 31 2017, 22:05

Merged Changes

CommitAuthorDetailsCommitted
92e920730daeGennadiy Civil/GitHub
Merge pull request #1240 from aninf-wo/hethi/fix-faq-example-comment 
Aug 31 2017
84bd72ba3cc7Herbert Thielen/GitHub
Merge branch 'master' into hethi/fix-faq-example-comment 
Aug 31 2017
14cf7f574a4fHerbert Thielen
fix example's comment 
Aug 31 2017
a430e9c176bdGennadiy Civil/GitHub
Merge pull request #865 from frosteyes/master 
Aug 31 2017
34355c0e870eClaus Stovgaard
Merge remote-tracking branch 'github_google/master' into master-github_frosteyes 
Aug 31 2017
16bfba08e2c6Gennadiy Civil/GitHub
Merge pull request #1230 from aninf-wo/hethi/travis-unused-cmake 
Aug 31 2017
c4ec2ac04de2Gennadiy Civil/GitHub
Merge branch 'master' into hethi/travis-unused-cmake 
Aug 30 2017
c780e0e2c4e6Herbert Thielen/GitHub
Merge branch 'master' into hethi/travis-unused-cmake 
Aug 30 2017
8364718500daHerbert Thielen
remove non-existing gmock_build_samples switch 
Aug 29 2017
a6418a4dd19eClaus Stovgaard
Merge remote-tracking branch 'github_google/master' into master-github_frosteyes 
Apr 5 2017
68f19facc26aClaus Stovgaard
Moved the ignoring of *.pyc files to top level for also covering googlemock… 
Aug 30 2016