Homec4science

Merge branch 'master' into feature/fix-build-error-vs2017-win10-jp

Authored by Masaru Tsuchiyama <m.tmatma@gmail.com> on Jul 18 2018, 23:51.

Description

Merge branch 'master' into feature/fix-build-error-vs2017-win10-jp

Event Timeline

GitHub <noreply@github.com> committed R9484:40cd5d117035: Merge branch 'master' into feature/fix-build-error-vs2017-win10-jp (authored by Masaru Tsuchiyama <m.tmatma@gmail.com>).Jul 18 2018, 23:51

Merged Changes

CommitAuthorDetailsCommitted
1370e7658b65Gennadiy Civil/GitHub
Merge pull request #1669 from syohex/ignore-ds-store 
Jul 18 2018
43163c19d5abGennadiy Civil/GitHub
Merge branch 'master' into ignore-ds-store 
Jul 18 2018
4235fff7f4c3Gennadiy Civil/GitHub
Merge pull request #1671 from gennadiycivil/master 
Jul 18 2018
d41bfd732f39Gennadiy Civil
Fix link 
Jul 18 2018
8d07cfd05323Gennadiy Civil
Code sync, mostly formatting and removing outdates 
Jul 18 2018
7e73a7ae6e66Gennadiy Civil
Formatting and a link 
Jul 18 2018
20ef7944a410Gennadiy Civil/GitHub
Merge pull request #1667 from hckr/patch-1 
Jul 18 2018
2211061e64d7Gennadiy Civil/GitHub
Merge pull request #1670 from gennadiycivil/master 
Jul 18 2018
4abbb774c39cGennadiy Civil
Merge branch 'master' of https://github.com/google/googletest 
Jul 17 2018
5437926b2213Gennadiy Civil
Docs sync 
Jul 17 2018
a091b7533253Syohei YOSHIDA
Ignore .DS_Store file 
Jul 17 2018
021c308069ccJakub Młokosiewicz/GitHub
Fix broken links to FAQ in primer.md 
Jul 17 2018