Diffusion Krita d07fcafcd1f1

Merge branch 'master' of git://anongit.kde.org/krita

Authored by dkazakov on Mar 19 2018, 12:21 PM.

Description

Merge branch 'master' of git://anongit.kde.org/krita

  1. Conflicts:
  2. libs/flake/text/KoSvgTextShape.cpp

BUG:392027

Merged Changes

CommitAuthorDetailsCommitted
bacc6a476ab5victorw
Fix potential crash when the last text input line in the SVG Text Tool is a… 
Mar 18 2018
dbd65ef7296frempt
Only set the LANG variable if the system is not Windows 
Mar 18 2018
6103e0c06126rempt
Add note about pkg-config 
Mar 18 2018
8e738a0e0a83woltherav
Remove all presets and brushes except for a handful. 
Mar 17 2018
7778f70c5429woltherav
Fix handling large author entries in resource manager. 
Mar 17 2018
e333b8fa0339woltherav
Fix 4.0 resource bundle to contain chisel_soft.png 
Mar 17 2018