Merge branch 'Plasma/5.16'
- Conflicts:
- CMakeLists.txt
- src/tests/integration/duplicate_attach_test.rb
- src/tests/integration/xml-data/show_bug.cgi_375161
sitter | Aug 12 2019, 12:27 PM |
Commit | Author | Details | Committed | |||
---|---|---|---|---|---|---|
64bfaf75cd21 | sitter | make fixture file name windows-safe | Aug 12 2019 | |||
08f344725509 | jriddell | Update version number for 5.16.4 GIT_SILENT | Jul 30 2019 |