Diffusion Krita 498cbae34c42

Merge branch 'master' into rempt/T5675-gmic-qt
498cbae34c42
Actions

Authored by rempt on Mar 23 2017, 8:36 AM.

Description

Merge branch 'master' into rempt/T5675-gmic-qt

Details

Committed
remptMar 23 2017, 8:36 AM
Parents
R37:0c810e755fa7: build fix
R37:8640e92a163b: BUG:364237 Don't switch documents automatically
Branches
Unknown
Tags
Unknown

Merged Changes

CommitAuthorDetailsCommitted
8640e92a163brempt
BUG:364237 Don't switch documents automatically 
Mar 22 2017
cee03068de4etimotheegiet
update calligraphy tool icon 
Mar 22 2017

Changes (6)

PathPackages
Pkrita/pics/tools/SVG/16/dark_calligraphy.svg
Copied from krita/pics/tools/SVG/16/light_krita_tool_freehand.svg
Pkrita/pics/tools/SVG/16/dark_krita_tool_freehand.svg
Copied from plugins/paintops/roundmarker/krita_roundmarkerop.svg
Pkrita/pics/tools/SVG/16/light_calligraphy.svg
Copied from krita/pics/tools/SVG/16/light_krita_tool_freehand.svg
Pkrita/pics/tools/SVG/16/light_krita_tool_freehand.svg
Copied to multiple locations:
krita/pics/tools/SVG/16/dark_calligraphy.svg
krita/pics/tools/SVG/16/light_calligraphy.svg
Mlibs/ui/KisMainWindow.cpp
Mlibs/ui/KisMainWindow.h

R37:498cbae34c42

View Options

krita/pics/tools/SVG/16/dark_calligraphy.svg

Loading...
View Options

krita/pics/tools/SVG/16/dark_krita_tool_freehand.svg

Loading...
View Options

krita/pics/tools/SVG/16/light_calligraphy.svg

Loading...
View Options

krita/pics/tools/SVG/16/light_krita_tool_freehand.svg

Loading...
View Options

libs/ui/KisMainWindow.cpp

Loading...
View Options

libs/ui/KisMainWindow.h

Loading...