Merge branch 'Plasma/5.15'

Authored by sitter on Feb 7 2019, 1:16 PM.

Description

Merge branch 'Plasma/5.15'

  1. Conflicts:
  2. CMakeLists.txt

Merged Changes

CommitAuthorDetailsCommitted
6b6e63a0388fD18807sitter
find volume feedback's runtime requirements 
Feb 7 2019
cd1e7261cd60jriddell
Update version number for 5.15.0 GIT_SILENT 
Feb 7 2019

Empty Commit

This commit is empty and does not affect any paths.