Diffusion Krita 0718fb65ab9f

Merge branch 'master' into krita-testing-wolthera

Authored by woltherav on Aug 20 2016, 2:49 PM.

Description

Merge branch 'master' into krita-testing-wolthera

Merged Changes

CommitAuthorDetailsCommitted
bba9f1c8cd83scottpetrovic
BUG:367537 fix 3_texture PNG file so it shows transparency. It was set to sRGB… 
Aug 20 2016
d2e66ccc85a7rempt
BUG:365693 Fix saving templates 
Aug 20 2016
e30da24d2fadrempt
BUG:367547 Fallback for loading color labels 
Aug 20 2016
80f83924db6frempt
BUG:367512 Fix canceling a filter preview 
Aug 20 2016
4800c7dd2ff1rempt
Fix wording in the spray brush engine 
Aug 20 2016
0a77e923d5b3tpaulssen
Merge remote-tracking branch 'origin/grid_guide_docker_layout_fix' 
Aug 19 2016
fb90378afe58dkazakov
Fix overflowing color labels 
Aug 19 2016
05020343e3b5fazek
Support for TVPaint's new CSV 1.1 format 
Aug 18 2016
75d11636ee20tpaulssen
fix layout of grid&guide docker (grid portion) 
Aug 18 2016
9c34fef33209D1166asavonic/dkazakov
BUG:360677 KisUpdaterContext should not kill threads in waitForDone() 
Aug 18 2016