Merge branch 'Plasma/5.18'

Authored by sitter on Mar 25 2020, 4:10 PM.

Description

Merge branch 'Plasma/5.18'

  1. Conflicts:
  2. CMakeLists.txt

Merged Changes

CommitAuthorDetailsCommitted
23d52fa33394D28276sitter
only add devices to the smb mount model that are network shares 
Mar 25 2020
4847c9e2fed2D28275sitter
skip over supposed network shares that aren't 
Mar 25 2020
53ff92062221D28059carewolf
Be more accurate in reporting the x86 CPU features solid detects 
Mar 16 2020
ecbfba574704jriddell
Update version number for 5.18.3 GIT_SILENT 
Mar 10 2020
0e2e9a34e534jriddell
Update version number for 5.18.2 GIT_SILENT 
Feb 25 2020
27380c8d7639jriddell
Update version number for 5.18.1 GIT_SILENT 
Feb 18 2020