Merge branch 'Plasma/5.18'
- Conflicts:
- CMakeLists.txt
sitter | Feb 8 2020, 5:23 PM |
Commit | Author | Details | Committed | |||
---|---|---|---|---|---|---|
4ea9df96ae03 | sitter | import currently used license copies for reuse compliance | Feb 8 2020 | |||
f1768f7b3ab9 | D27061 | sitter | replace samba module with data that works | Feb 8 2020 | ||
0fb08bd6b5c3 | jriddell | Update version number for 5.18.0 GIT_SILENT | Feb 6 2020 |