Diffusion Krita 4f5969473f26

Fix merge conflict
4f5969473f26
Actions

Authored by rempt on Sep 10 2019, 8:45 AM.

Tags

None

Subscribers

None

Description

Fix merge conflict

Details

Committed

Sep 10 2019, 8:45 AM

Parents

R37:b22e78f4c0bc: Don't return between QPainter save and restore

Branches

Unknown

Tags

Unknown

References

refs/keep-around/4f5969473f26f395e930ddebfa2745be8b93e905

rempt committed R37:4f5969473f26: Fix merge conflict (authored by rempt).Sep 10 2019, 8:45 AM

Changes (1)

				Path	Packages
	M			libs/ui/KisWelcomePageWidget.h

R37:4f5969473f26

libs/ui/KisWelcomePageWidget.h

Loading...