Merge branch 'Plasma/5.17'
- Conflicts:
- CMakeLists.txt
sitter | Nov 13 2019, 5:08 PM |
Commit | Author | Details | Committed | |||
---|---|---|---|---|---|---|
4f161fa0b57f | sitter | disable systeminfo test on systems without uname | Nov 13 2019 | |||
fb50d436d178 | sitter | fix msvc compatibility | Nov 13 2019 | |||
9c7677f31908 | jriddell | Update version number for 5.17.3 GIT_SILENT | Nov 12 2019 |