Merge branch 'master' of git://anongit.kde.org/krita
- Conflicts:
- libs/flake/text/KoSvgTextShape.cpp
BUG:392027
Merge branch 'master' of git://anongit.kde.org/krita
BUG:392027
dkazakov | Mar 19 2018, 12:21 PM |
Commit | Author | Details | Committed | |||
---|---|---|---|---|---|---|
bacc6a476ab5 | victorw | Fix potential crash when the last text input line in the SVG Text Tool is a… | Mar 18 2018 | |||
dbd65ef7296f | rempt | Only set the LANG variable if the system is not Windows | Mar 18 2018 | |||
6103e0c06126 | rempt | Add note about pkg-config | Mar 18 2018 | |||
8e738a0e0a83 | woltherav | Remove all presets and brushes except for a handful. | Mar 17 2018 | |||
7778f70c5429 | woltherav | Fix handling large author entries in resource manager. | Mar 17 2018 | |||
e333b8fa0339 | woltherav | Fix 4.0 resource bundle to contain chisel_soft.png | Mar 17 2018 |