Conflicts:
	krita/plugins/formats/xcf/3rdparty/xcftools/config.h
	krita/ui/CMakeLists.txt
	krita/ui/KisDocumentEntry.h
	krita/ui/KisFilterEntry.h
	krita/ui/canvas/kis_grid_manager.cpp
	krita/ui/input/wintab/kis_tablet_support_x11.h
	libs/db/expression.cpp