Merge branch 'Plasma/5.18'
- Conflicts:
- CMakeLists.txt
sitter | Mar 20 2020, 1:09 PM |
Commit | Author | Details | Committed | |||
---|---|---|---|---|---|---|
80efb36bc807 | D28098 | sitter | remove pointless and arbitrary 4 line frame limit | Mar 20 2020 | ||
4c986ea51826 | jriddell | Update version number for 5.18.3 GIT_SILENT | Mar 10 2020 | |||
9489b933e5bc | jjazeix | fix windows compilation, QString.sprintf() is deprecated | Mar 7 2020 |