Homec4science

Merge branch 'master' into googletest_for_asam

Authored by duxiuxing <duxiuxing@qq.com> on Jul 20 2018, 00:16.

Description

Merge branch 'master' into googletest_for_asam

Event Timeline

GitHub <noreply@github.com> committed R9484:d8db0ca9cf22: Merge branch 'master' into googletest_for_asam (authored by duxiuxing <duxiuxing@qq.com>).Jul 20 2018, 00:16

Merged Changes

CommitAuthorDetailsCommitted
6ce9b98f541bGennadiy Civil/GitHub
Merge pull request #1674 from gennadiycivil/master 
Jul 19 2018
61b819721758Gennadiy Civil/GitHub
Merge branch 'master' into master 
Jul 19 2018
0c17888bcfa7Gennadiy Civil
code sync 
Jul 19 2018
a3509a5aa49eGennadiy Civil
Merge branch 'master' of https://github.com/google/googletest 
Jul 18 2018
3530ab9e437bGennadiy Civil
Code sync 
Jul 18 2018