T6503-python-win
e4440eda2536
Actions

Authored by alvinhochun on Jul 20 2017, 4:32 PM.

Description

Merge branch 'alvin/T6521-deps-update-win' into alvin/T6503-python-win

Committed

alvinhochun

Jul 20 2017, 4:32 PM

Parents

Branches

Unknown

Tags

Unknown

Commit	Author	Details	Committed
384d37140ea5	alvinhochun	Merge branch 'master' into alvin/T6521-deps-update-win	Jul 20 2017
078cb4e09c8a	alvinhochun	Make the Krita SIP module depend on the SIP files	Jul 20 2017
4c8f71f309fb	timotheegiet	new warning icon	Jul 20 2017
a67b218e684d	timotheegiet	icon for smart patch tool	Jul 20 2017
1f2031628b64	victorw	Added optional success state bool to KoColor::fromXML() to improve handling of…	Jul 19 2017
2bb8af168d03	rempt	Revert "Remove the triple-click event from KoToolBase"	Jul 19 2017
c76baa099d72	woltherav	Add a function to get the total colors from a palette, and add stuff to palette…	Jul 18 2017

				Path	Packages
	P			krita/pics/svg/dark_warning.svg Copied from krita/pics/svg/light_smoothing-no.svg
	P			krita/pics/svg/light_warning.svg Copied from krita/pics/svg/light_smoothing-no.svg
	M			krita/pics/svg/svg-icons.qrc
	M			krita/pics/tools/SVG/16/dark_krita_tool_smart_patch.svg
	M			krita/pics/tools/SVG/16/light_krita_tool_smart_patch.svg
	M			libs/flake/KoToolBase.cpp
	M			libs/flake/KoToolBase.h
	M			libs/flake/KoToolProxy.cpp
	M			libs/flake/KoToolProxy_p.h
	M			libs/image/kis_properties_configuration.cc
	M			libs/libkis/Palette.cpp
	M			libs/libkis/Palette.h
	M			libs/pigment/KoColor.cpp
	M			libs/pigment/KoColor.h
	M			libs/ui/tool/kis_tool.cc
	M			libs/ui/tool/kis_tool.h
	M			plugins/extensions/pykrita/plugin/plugins/palette_docker/palette_docker.py
	M			plugins/extensions/pykrita/sip/CMakeLists.txt
	M			plugins/extensions/pykrita/sip/krita/Palette.sip
	M			plugins/flake/textshape/TextTool.cpp
	M			plugins/flake/textshape/TextTool.h
	M			plugins/impex/jpeg/kis_jpeg_export.cc
	M			plugins/impex/png/kis_png_export.cc