Homec4science

Merge branch 'master' into blaze-build-travis

Description

Merge branch 'master' into blaze-build-travis

Event Timeline

GitHub <noreply@github.com> committed R9484:ed811dc79feb: Merge branch 'master' into blaze-build-travis (authored by Gennadiy Civil <gennadiycivil@users.noreply.github.com>).Dec 11 2017, 16:48

Merged Changes

CommitAuthorDetailsCommitted
59202300f1a7Gennadiy Civil/GitHub
Merge pull request #1333 from sam-lunt/use-system-includes 
Dec 9 2017
10ef1d9a1e7eGennadiy Civil/GitHub
Merge branch 'master' into use-system-includes 
Dec 8 2017
ce919c3ddf80Gennadiy Civil/GitHub
Merge branch 'master' into use-system-includes 
Dec 1 2017
f46bd00e369eSam Lunt/Sam Lunt
make includes system 
Nov 28 2017