Merge branch 'master' into multicursor

Authored by dhaumann on Nov 19 2016, 1:34 PM.

Description

Merge branch 'master' into multicursor

This now includes the switch to using KSyntaxHighlighting

Merged Changes

CommitAuthorDetailsCommitted
cda999c901a9vkrause
Use syntax definitions from KF5::SyntaxHighlighting 
Nov 19 2016