Solve conflicts by popping stashed PaletteListWidget
1ac5673f5440
Actions

Authored by mzhou on Jul 2 2018, 9:33 AM.

Description

Solve conflicts by popping stashed PaletteListWidget

Committed

mzhou

Jul 2 2018, 9:33 AM

Parents

R37:27b3fa4dc043: Commit to pop PaletteListWidget in stash

Branches

Unknown

Tags

Unknown

				Path	Packages
	M			libs/pigment/resources/KoColorSet.cpp
	M			libs/pigment/resources/KoColorSet.h
	A			libs/pigment/resources/KoColorSetEntryGroup.cpp
	A			libs/pigment/resources/KoColorSetEntryGroup.h
	M			libs/widgets/CMakeLists.txt