Merge branch 'Plasma/5.17'

Authored by sitter on Oct 23 2019, 2:58 PM.

Description

Merge branch 'Plasma/5.17'

  1. Conflicts:
  2. CMakeLists.txt

Details

Committed
sitterOct 23 2019, 2:58 PM
Parents
R871:45ea4d554c54: typo--
R871:8b8f813620b5: Report windowing system
Branches
Unknown
Tags
Unknown

Merged Changes

CommitAuthorDetailsCommitted
45ea4d554c54sitter
typo-- 
Oct 23
7a3250ee2d0c jriddell
Update version number for 5.17.1 GIT_SILENT 
Oct 22
c53f245bdaba jriddell
Update version number for 5.17.0 GIT_SILENT 
Oct 10