Merge branch 'master' of git://anongit.kde.org/labplot into gsoc2017_live_data

Authored by fkristof on Jul 12 2017, 11:30 PM.

Description

Merge branch 'master' of git://anongit.kde.org/labplot into gsoc2017_live_data

Merged Changes

CommitAuthorDetailsCommitted
2c19b4bb78c4sgerlach
try another fix for MSVC 
Jul 12 2017
b07c50ea3604sgerlach
try to fix MSVC compile errors 
Jul 12 2017
f03be36e2d69sgerlach
merge fixes 
Jul 12 2017
81b5d7893733sgerlach
minor fixes 
Jul 12 2017