Merge branch 'Plasma/5.18'

Authored by sitter on Feb 8 2020, 5:23 PM.

Description

Merge branch 'Plasma/5.18'

  1. Conflicts:
  2. CMakeLists.txt

Merged Changes

CommitAuthorDetailsCommitted
4ea9df96ae03sitter
import currently used license copies for reuse compliance 
Feb 8 2020
f1768f7b3ab9D27061sitter
replace samba module with data that works 
Feb 8 2020
0fb08bd6b5c3jriddell
Update version number for 5.18.0 GIT_SILENT 
Feb 6 2020