Diffusion Krita c2f96d1fc6c1

Merge branch 'master' into rempt/T1625-python-scripting
c2f96d1fc6c1
Actions

Authored by rempt on Oct 14 2016, 7:39 AM.

Description

Merge branch 'master' into rempt/T1625-python-scripting

Details

Committed

rempt

Oct 14 2016, 7:39 AM

Parents

R37:c6895fa9f37e: add a readme to collect useful links
R37:54c43f8ff43a: macOS only - Qt5.7+Xcode 8 support

Branches

Unknown

Tags

Unknown

rempt committed R37:c2f96d1fc6c1: Merge branch 'master' into rempt/T1625-python-scripting (authored by rempt).Oct 14 2016, 7:39 AM

Merged Changes

Commit		Author	Details	Committed
54c43f8ff43a		pkouame	macOS only - Qt5.7+Xcode 8 support	Oct 12 2016
9b1fda27517d	D2890	tantsevov	Move Tool fix.	Oct 11 2016
519be643a95c	D3010	nicholasl	Fix PgUp/PgDn on layer stack	Oct 10 2016
dd00da8163bd		dkazakov	Add comments into KUndo2Command about inheriting it from QObject	Oct 10 2016
6fbdaac42407		rempt	BUG:370404 Don't crash when using split layer in another language	Oct 10 2016
219fc4a5fba9		l10n daemon script	SVN_SILENT made messages (.desktop file) - always resolve ours	Oct 10 2016
b10e6be9a512		rempt	debug--	Oct 10 2016

Changes (64)

				Path	Packages
	M			3rdparty/ext_qt/CMakeLists.txt
	A			3rdparty/ext_qt/mac-default.patch
	A			3rdparty/ext_qt/qtbase-configure.patch
	M			krita/data/templates/animation/Anim-Jp-EN.desktop
	M			krita/data/templates/animation/Anim-Jp-JP.desktop
	M			krita/data/templates/comics/.directory
	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/.directory
	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/dslr/.directory
	M			krita/data/templates/dslr/Canon_550D_5184x3456.desktop
	M			krita/data/templates/dslr/Canon_5Dmk3_5760x3840.desktop
	M			krita/data/templates/dslr/Nikon_D3000_3872x2592.desktop
	M			krita/data/templates/dslr/Nikon_D5000_4288x2848.desktop
	M			krita/data/templates/dslr/Nikon_D7000_4928x3264.desktop
	M			krita/data/templates/texture/.directory
	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			krita/krita.action
	M			krita/org.kde.krita.desktop
	M			libs/image/brushengine/kis_paintop_settings.cpp
	M			libs/kundo2/kundo2stack.h
	M			packaging/linux/snap/setup/gui/krita.desktop
	M			plugins/extensions/layersplit/dlg_layersplit.cpp
	M			plugins/extensions/layersplit/dlg_layersplit.h
	M			plugins/extensions/layersplit/layersplit.cpp
	M			plugins/impex/bmp/krita_bmp.desktop
	M			plugins/impex/brush/krita_brush.desktop
	M			plugins/impex/csv/krita_csv.desktop
	M			plugins/impex/exr/krita_exr.desktop
	M			plugins/impex/heightmap/krita_heightmap.desktop
	M			plugins/impex/jpeg/krita_jpeg.desktop
	M			plugins/impex/odg/krita_odg.desktop
	M			plugins/impex/ora/krita_ora.desktop
	M			plugins/impex/pdf/krita_pdf.desktop
	M			plugins/impex/png/krita_png.desktop
	M			plugins/impex/ppm/krita_ppm.desktop
	M			plugins/impex/psd/krita_psd.desktop
	M			plugins/impex/raw/krita_raw.desktop
	M			plugins/impex/spriter/krita_spriter.desktop
	M			plugins/impex/tga/krita_tga.desktop
	M			plugins/impex/tiff/krita_tiff.desktop
	M			plugins/impex/xcf/krita_xcf.desktop
	M			plugins/tools/basictools/kis_tool_move.cc
	M			plugins/tools/basictools/kis_tool_move.h