Merge branch '1.5' into 1.6

Authored by hein on Nov 10 2017, 9:38 PM.

Description

Merge branch '1.5' into 1.6

Details

Committed
heinNov 10 2017, 9:38 PM
Parents
R7:955d6c8ef6e0: Update changelog
R7:cd34724f606b: SVN_SILENT made messages (.desktop file) - always resolve ours
Branches
Unknown
Tags
Unknown
References
1.6

Merged Changes

CommitAuthorDetailsCommitted
955d6c8ef6e0hein
Update changelog 
Nov 10 2017
6a7f59ee1b9dargonel/hein
Stay within bounds 
Nov 10 2017
f07889acf9e5l10n daemon script
SVN_SILENT made messages (.desktop file) 
Nov 7 2016
4a2a5876fe5el10n daemon script
SVN_SILENT made messages (.desktop file) 
Nov 2 2016
c152a8b6e3eel10n daemon script
SVN_SILENT made messages (.desktop file) 
Sep 13 2016
09ddda3f8307l10n daemon script
SVN_SILENT made messages (.desktop file) 
Feb 16 2016