# Conflicts:
#	krita/krita.xmlgui
#	libs/pigment/KoColorSpaceEngine.h
#	libs/pigment/KoColorSpaceRegistry.cpp
#	libs/pigment/colorspaces/KoSimpleColorSpaceEngine.h
#	libs/ui/canvas/kis_canvas2.h
#	libs/ui/widgets/KoStrokeConfigWidget.h
#	libs/widgets/KoStrokeConfigWidget.cpp
#	plugins/color/lcms2engine/IccColorSpaceEngine.cpp
#	plugins/color/lcms2engine/IccColorSpaceEngine.h
#	plugins/tools/basictools/kis_tool_pencil.cc
#	plugins/tools/defaulttool/connectionTool/ConnectionTool.cpp
#	plugins/tools/defaulttool/defaulttool/DefaultTool.cpp
#	plugins/tools/defaulttool/defaulttool/DefaultToolTransformWidget.cpp
#	plugins/tools/defaulttool/defaulttool/DefaultToolWidget.cpp