Diffusion Krita cded54d17408

Fix merge error
cded54d17408
Actions

Authored by rempt on Sep 17 2018, 1:03 PM.

Tags

None

Subscribers

None

Description

Fix merge error

Details

Committed

Sep 17 2018, 1:03 PM

Parents

R37:04c26c84d28e: Merge remote-tracking branch 'origin' into mzhou/T8646-palette-docker

Branches

Unknown

Tags

Unknown

rempt committed R37:cded54d17408: Fix merge error (authored by rempt).Sep 17 2018, 1:03 PM

Changes (1)

				Path	Packages
	M			libs/ui/CMakeLists.txt

R37:cded54d17408

libs/ui/CMakeLists.txt

Loading...