Merge branch 'Plasma/5.15'
- Conflicts:
- CMakeLists.txt
sitter | Feb 7 2019, 1:16 PM |
Commit | Author | Details | Committed | |||
---|---|---|---|---|---|---|
6b6e63a0388f | D18807 | sitter | find volume feedback's runtime requirements | Feb 7 2019 | ||
cd1e7261cd60 | jriddell | Update version number for 5.15.0 GIT_SILENT | Feb 7 2019 |