Merge branch 'Plasma/5.16'

Authored by sitter on Aug 12 2019, 12:27 PM.

Description

Merge branch 'Plasma/5.16'

  1. Conflicts:
  2. CMakeLists.txt
  3. src/tests/integration/duplicate_attach_test.rb
  4. src/tests/integration/xml-data/show_bug.cgi_375161

Merged Changes

CommitAuthorDetailsCommitted
64bfaf75cd21sitter
make fixture file name windows-safe 
Aug 12 2019
08f344725509jriddell
Update version number for 5.16.4 GIT_SILENT 
Jul 30 2019

Empty Commit

This commit is empty and does not affect any paths.