Homec4science

Merge branch 'master' of https://github.com/google/googletest

Authored by Gennadiy Civil <misterg@google.com> on Mar 13 2018, 16:13.

Description

Merge branch 'master' of https://github.com/google/googletest

Event Timeline

Gennadiy Civil <misterg@google.com> committed R9484:5461f63d0120: Merge branch 'master' of https://github.com/google/googletest (authored by Gennadiy Civil <misterg@google.com>).Mar 13 2018, 16:13

Merged Changes

CommitAuthorDetailsCommitted
f35fe6de3b25Gennadiy Civil/GitHub
Merge pull request #1503 from sheepmaster/upstream_188748737 
Mar 12 2018
fc437ef4b2c0Bernhard Bauer/GitHub
Merge branch 'master' into upstream_188748737 
Mar 12 2018
7b70413e0ca5Bernhard Bauer
Allow macros inside of parametrized test names. 
Mar 12 2018
abc6e943e087Gennadiy Civil/GitHub
Merge pull request #1502 from gennadiycivil/master 
Mar 12 2018