Merge branch 'Plasma/5.17'

Authored by sitter on Nov 13 2019, 5:08 PM.

Description

Merge branch 'Plasma/5.17'

  1. Conflicts:
  2. CMakeLists.txt

Merged Changes

CommitAuthorDetailsCommitted
4f161fa0b57fsitter
disable systeminfo test on systems without uname 
Nov 13 2019
fb50d436d178sitter
fix msvc compatibility 
Nov 13 2019
9c7677f31908jriddell
Update version number for 5.17.3 GIT_SILENT 
Nov 12 2019