Merge branch 'master' into rempt/T379-resource-management
48e48d50bdc5
Actions

Authored by rempt on Mar 6 2019, 9:49 AM.

Description

Merge branch 'master' into rempt/T379-resource-management

Committed

rempt

Mar 6 2019, 9:49 AM

Parents

Branches

Unknown

Tags

Unknown

	Commit			Author	Details	Committed
	964ce1449b3b			rempt	Remove the integration of KisIconWidget with KisResourceServerAdapter	Mar 6 2019
	a8ad9c6d4506		D19545	tymond	Fix the low pixel size limit in Scale to New Size dialog	Mar 6 2019

				Path	Packages
	M			libs/ui/kis_control_frame.cpp
	M			libs/ui/kis_paintop_box.cc
	M			libs/ui/widgets/kis_iconwidget.cc
	M			libs/ui/widgets/kis_iconwidget.h
	M			plugins/extensions/imagesize/dlg_imagesize.cc