Merge branch 'Plasma/5.5'

Authored by Andreas Sturmlechner <andreas.sturmlechner@gmail.com>.

Description

Merge branch 'Plasma/5.5'

Details

Committed
Andreas Sturmlechner <andreas.sturmlechner@gmail.com>Dec 23 2015, 10:17 PM
Parents
R98:28b715309d1d: Relax cmake version requirement to rest of plasma
R98:f99f707504c3: merge Plasma/5.5
Branches
Unknown
Tags
Unknown
Andreas Sturmlechner <andreas.sturmlechner@gmail.com> committed R98:66f9394ef543: Merge branch 'Plasma/5.5' (authored by Andreas Sturmlechner <andreas.sturmlechner@gmail.com>).Dec 23 2015, 10:17 PM

Merged Changes

CommitAuthorDetailsCommitted
28b715309d1dAndreas Sturmlechner
Relax cmake version requirement to rest of plasma 
Dec 22 2015
c9e81578fa83Jonathan Riddell
Update version number for 5.5.2 GIT_SILENT 
Dec 22 2015
f871d037b89aJonathan Riddell
Update version number for 5.5.1 GIT_SILENT 
Dec 15 2015