Diffusion Krita 3010405ab77d

Merge branch 'master' into rempt/T379-resource-management
3010405ab77d
Actions

Authored by rempt on Dec 7 2018, 1:19 PM.

Description

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

Details

Committed

rempt

Dec 7 2018, 1:19 PM

Parents

R37:1ad126c0e881: Fix build on Windows
R37:383f6507f3d6: SVN_SILENT made messages (.desktop file) - always resolve ours

Branches

Unknown

Tags

Unknown

rempt committed R37:3010405ab77d: Merge branch 'master' into rempt/T379-resource-management (authored by rempt).Dec 7 2018, 1:19 PM

Merged Changes

	Commit			Author	Details	Committed
	383f6507f3d6			l10n daemon script	SVN_SILENT made messages (.desktop file) - always resolve ours	Dec 6 2018
	f73570828c42			dkazakov/rempt	Fix newlines in the shader's patch	Dec 5 2018

Changes (32)

				Path	Packages
	M			krita/data/templates/comics/BD-EuroTemplate.desktop
	M			krita/data/templates/comics/Comics-USTemplate.desktop
	M			krita/data/templates/comics/Manga-JpTemplate.desktop
	M			krita/data/templates/comics/a4_waffle_grid.desktop
	M			krita/data/templates/design/Designcinema16_10_2484x1200_96dpiRGB_8bit_.desktop
	M			krita/data/templates/design/Designcinema2.39_1_2484x1040_96dpiRGB_8bit_.desktop
	M			krita/data/templates/design/DesignpresentationA3Landscape_4960x3508_300dpiRGB_8bit_.desktop
	M			krita/data/templates/design/DesignpresentationA4portrait_2480x3508,300dpiRGB_8bit_.desktop
	M			krita/data/templates/design/DesignpresentationA4portrait_2480x3508_300dpiRGB_8bit_.desktop
	M			krita/data/templates/design/Designscreen4_3_2250x1680_96dpiRGB_8bit_.desktop
	M			krita/data/templates/design/web_design.desktop
	M			krita/data/templates/texture/Texture1024x10248bitsrgb.desktop
	M			krita/data/templates/texture/Texture1k32bitscalar.desktop
	M			krita/data/templates/texture/Texture1k8bitsrgb.desktop
	M			krita/data/templates/texture/Texture2048x20488bitsrgb.desktop
	M			krita/data/templates/texture/Texture256x2568bitsrgb.desktop
	M			krita/data/templates/texture/Texture2k32bitscalar.desktop
	M			krita/data/templates/texture/Texture2k8bitsrgb.desktop
	M			krita/data/templates/texture/Texture4096x40968bitsrgb.desktop
	M			krita/data/templates/texture/Texture4k32bitscalar.desktop
	M			krita/data/templates/texture/Texture4k8bitsrgb.desktop
	M			krita/data/templates/texture/Texture512x5128bitsrgb.desktop
	M			krita/data/templates/texture/Texture8k32bitscalar.desktop
	M			krita/data/templates/texture/Texture8k8bitsrgb.desktop
	M			libs/ui/opengl/kis_opengl_shader_loader.cpp
	M			plugins/python/colorspace/kritapykrita_colorspace.desktop
	M			plugins/python/documenttools/kritapykrita_documenttools.desktop
	M			plugins/python/filtermanager/kritapykrita_filtermanager.desktop
	M			plugins/python/lastdocumentsdocker/kritapykrita_lastdocumentsdocker.desktop
	M			plugins/python/quick_settings_docker/kritapykrita_quick_settings_docker.desktop
	M			plugins/python/scriptdocker/kritapykrita_scriptdocker.desktop
	M			plugins/python/tenscripts/kritapykrita_tenscripts.desktop