Merge remote-tracking branch 'origin/master' into stable

Authored by vonreth on Jun 21 2018, 7:08 AM.

Description

Merge remote-tracking branch 'origin/master' into stable

Details

Committed
vonrethJun 21 2018, 7:08 AM
Parents
R867:2a0cf829b094: Prepare Qt 5.11.1
R867:a2301485abd2: Use utf8 for config files
Branches
Unknown
Tags
Unknown

Merged Changes

CommitAuthorDetailsCommitted
2a0cf829b094vonreth
Prepare Qt 5.11.1 
Jun 19
c148b64f1379vonreth
Add craftmaster blueprint to allow updates through craft 
Jun 18
fa750f9c75d8vonreth
More utf8 
Jun 13
7aae3bbc1758vonreth
Use utf8 for config files 
Jun 13