Homec4science

Merge branch 'master' into master

Authored by tisi1988 <tisi1988@gmail.com> on Jul 12 2018, 11:06.

Description

Merge branch 'master' into master

Event Timeline

GitHub <noreply@github.com> committed R9484:de6e079f15b0: Merge branch 'master' into master (authored by tisi1988 <tisi1988@gmail.com>).Jul 12 2018, 11:06

Merged Changes

CommitAuthorDetailsCommitted
41f0e24335d8Gennadiy Civil/GitHub
Merge pull request #1647 from duxiuxing/googletest_for_asam 
Jul 11 2018
d91b0de99e5bGennadiy Civil/GitHub
Merge branch 'master' into googletest_for_asam 
Jul 11 2018
7eae4ea4e149Gennadiy Civil/GitHub
Merge pull request #1656 from gennadiycivil/master 
Jul 11 2018
36066cfecf79Gennadiy Civil
more formatting [skip ci] 
Jul 11 2018
74cccf494a11Gennadiy Civil
formatting, [ci skip] 
Jul 11 2018
4f9194286ca7Gennadiy Civil
Fix heading 
Jul 10 2018
50daf299c278Gennadiy Civil
Docs sync 
Jul 10 2018
03ea2fdecb7a杜修杏
VS2005 with SP1(_MSC_VER=1400) already supports __pragma 
Jun 29 2018