Merge branch 'Plasma/5.17'
- Conflicts:
- CMakeLists.txt
sitter | Oct 23 2019, 2:58 PM |
Commit | Author | Details | Committed | |||
---|---|---|---|---|---|---|
45ea4d554c54 | sitter | typo-- | Oct 23 2019 | |||
7a3250ee2d0c | • jriddell | Update version number for 5.17.1 GIT_SILENT | Oct 22 2019 | |||
c53f245bdaba | • jriddell | Update version number for 5.17.0 GIT_SILENT | Oct 10 2019 |