Homec4science

Merge branch 'master' into master

Authored by Jonny007-MKD <Jonny007-MKD@users.noreply.github.com> on Sep 13 2018, 18:23.

Description

Merge branch 'master' into master

Event Timeline

GitHub <noreply@github.com> committed R9484:3c80556859cd: Merge branch 'master' into master (authored by Jonny007-MKD <Jonny007-MKD@users.noreply.github.com>).Sep 13 2018, 18:23

Merged Changes

CommitAuthorDetailsCommitted
cfe0ae867857Gennadiy Civil/GitHub
Merge pull request #1831 from anthraxx/fix/version 
Sep 13 2018
2649c2218181Gennadiy Civil/GitHub
Merge pull request #1834 from google/9A681768AABE08D1EFA5CA77528236A4 
Sep 13 2018
0cd3c2e8b4b3misterg/Gennadiy Civil
Googletest export 
Sep 13 2018
21d52d3a1d3amisterg/Gennadiy Civil
Googletest export 
Sep 13 2018
e1b8d82fa654misterg/Gennadiy Civil
Googletest export 
Sep 13 2018
c4ef6f3a0509Levente Polyak
version: fix declared version to be in sync with CMakeLists.txt 
Sep 13 2018