Merge branch 'Plasma/5.6'

Authored by drosca on Apr 12 2016, 11:11 AM.

Description

Merge branch 'Plasma/5.6'

Details

Committed
droscaApr 12 2016, 11:11 AM
Parents
R115:2edb4f296e31: Fix MapBase::reset()
R115:9ac694ade1de: Fix minor typo
Branches
Unknown
Tags
Unknown

Merged Changes

CommitAuthorDetailsCommitted
2edb4f296e31drosca
Fix MapBase::reset() 
Apr 12 2016
df5157920cfal10n daemon script
SVN_SILENT made messages (.desktop file) 
Apr 11 2016
ae64cd7ee444jriddell
Update version number for 5.6.2 GIT_SILENT 
Apr 5 2016