fix and merge

Authored by camiloh on Jan 3 2020, 2:01 AM.

Description

fix and merge

Merged Changes

CommitAuthorDetailsCommitted
fca562a7389fcamiloh
Merge branch 'cmake' into 'master' 
Jan 2 2020
8dca1480c021nicolasfella/camiloh
Rework cmake code 
Jan 2 2020
c5663836344el10n daemon script
SVN_SILENT made messages (.desktop file) - always resolve ours 
Dec 28 2019