Homec4science

Merge branch 'master' into deprecate

Description

Merge branch 'master' into deprecate

Event Timeline

GitHub <noreply@github.com> committed R9484:fd4f7cc7299e: Merge branch 'master' into deprecate (authored by Gennadiy Civil <gennadiycivil@users.noreply.github.com>).Jul 20 2018, 21:53

Merged Changes

CommitAuthorDetailsCommitted
2a151c93c180Gennadiy Civil/GitHub
Merge pull request #1676 from gennadiycivil/master 
Jul 20 2018
a02af2f68942Gennadiy Civil
code merge 
Jul 20 2018
c62c79432bd2Gennadiy Civil/GitHub
Merge pull request #1668 from duxiuxing/googletest_for_asam 
Jul 20 2018
d8db0ca9cf22duxiuxing/GitHub
Merge branch 'master' into googletest_for_asam 
Jul 20 2018
2eb439600764杜修杏
Replace "…" with "..."(three dots) to fix warning C4819 in Visual Studio 
Jul 20 2018
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
5b19054b0240duxiuxing/GitHub
Merge branch 'master' into googletest_for_asam 
Jul 19 2018
a3509a5aa49eGennadiy Civil
Merge branch 'master' of https://github.com/google/googletest 
Jul 18 2018
3530ab9e437bGennadiy Civil
Code sync 
Jul 18 2018
65a49a73f0e7duxiuxing
Fix warning C4819: The file contains a character that cannot be represented in… 
Jul 17 2018