Diffusion Krita 8b1e45185e98

Resolved merge conflicts.
8b1e45185e98
Actions

Authored by lieroz on Aug 7 2018, 7:32 PM.

Tags

None

Subscribers

None

Description

Resolved merge conflicts.

Details

Committed

Aug 7 2018, 7:32 PM

Parents

R37:7d39292232e2: Merge branch 'master' into akamakin/T9268-scheduler-optimization

Branches

Unknown

Tags

Unknown

Tasks

T9268: Krita's work scheduler internal lock fixes

lieroz committed R37:8b1e45185e98: Resolved merge conflicts. (authored by lieroz).Aug 7 2018, 7:32 PM

lieroz added a task: T9268: Krita's work scheduler internal lock fixes.

Changes (2)

				Path	Packages
	M			libs/image/kis_updater_context.cpp
	M			libs/image/kis_updater_context.h

R37:8b1e45185e98

libs/image/kis_updater_context.cpp

Loading...

libs/image/kis_updater_context.h

Loading...