Diffusion Krita e66a166a39c6

krita into reset…
e66a166a39c6
Actions

Authored by workingdodo on Apr 11 2020, 10:23 AM.

Description

Merge branch 'master' of https://invent.kde.org/kde/krita into reset-configurations

Details

Committed

workingdodo

Apr 11 2020, 10:23 AM

Parents

R37:924b9ce033bb: Now backs up KritaRC, avoids sync issues
R37:22cb6a764d8f: Fix compilation on clang

Branches

Unknown

Tags

Unknown

References

refs/keep-around/e66a166a39c6990bcebde1213f8e58f264b7d36a

workingdodo committed R37:e66a166a39c6: Merge branch 'master' of https://invent.kde.org/kde/krita into reset… (authored by workingdodo).Apr 11 2020, 10:23 AM

Merged Changes

This commit merges a very large number of changes. Only the first 50 are shown.

Commit	Author	Details	Committed
22cb6a764d8f	dkazakov	Fix compilation on clang	Apr 10 2020
5a82b0104c97	dkazakov	Add a workaround for a bug(?) in clang	Apr 10 2020
ba0fb8031de2	rempt	Revert "Set focus on the view on mouse-over"	Apr 10 2020
3145ca09146e	rempt	Fix pasting SVG as vectors on Windows	Apr 10 2020
5438445da965	rempt	Set focus on the view on mouse-over	Apr 10 2020
e4a52e4b2bf2	dkazakov	One more try to fix build without Vc	Apr 9 2020
f851b9874510	dkazakov	Fix compilation of KoAlphaMaskApplicator when no Vc is available	Apr 9 2020
480889830375	rempt	Update version of openssl	Apr 9 2020
104daceb5a62	rempt	Fix use of regexps with newer versions of cmake	Apr 9 2020
d1f7d40b713c	rempt	Add krita-artsts to the readme	Apr 9 2020
aec9650b5459	rempt	Update the 3rdparty readme a bit	Apr 9 2020
a41aa0bfe59d	dkazakov	Add ifdefs for half type	Apr 9 2020
a3be14597950	dkazakov	Try to fix clang builds again	Apr 9 2020
a1cd8d74b1a7	emmetoneill	Added user setting for autopinning layers to timeline.	Apr 8 2020
46f9f7e9130a	emmetoneill	Animation UI: "Show on Timeline">"Pin to Timeline"	Apr 8 2020
8aff5f593da4	dkazakov	Fix compilation on clang	Apr 8 2020
2ed36637e00d	vanyossi	pkg macOS: add debug options	Apr 8 2020
3044db3e019f	vanyossi	pkg macOS: make rpath fix more general	Apr 8 2020
be33c73bd677	dkazakov	Rename methods in KisBrushChooser	Apr 8 2020
4ae078967406	dkazakov	Fix adjustment sliders not working	Apr 8 2020
7b03dee2f1d7	dkazakov	Fix documentation for fillGrayBrushWithColorAndLightnessOverlay	Apr 8 2020
6aea28a734cd	dkazakov	Implement vectorized impleemntation of brush alpha mask application	Apr 8 2020
acdc67f01ab0	dkazakov	Remove sanity check in KisBrush	Apr 8 2020
08a5f1b74d6e	dkazakov	Merge branch 'master' of git://anongit.kde.org/krita	Apr 8 2020
3109e7b84bd7	dkazakov	Merge remote-tracking branch 'dkazakov/preserve-lightness-brush'	Apr 8 2020
f35fba8e4a6b	rempt	Use QImageReader to read the reference images	Apr 8 2020
4c6fce4b2035	vanyossi/rempt	Fix python 3.8 warnings on comic project management	Apr 8 2020
4796dca5787f	l10n daemon script	SVN_SILENT made messages (.desktop file) - always resolve ours	Apr 8 2020
7db236a20f6d	eoinoneill/dkazakov	AnimationRenderer Readded Constructor Items for UniqueFrames Only	Apr 7 2020
1ee6ceb4d8ec	eoinoneill/dkazakov	Optimized Animation Renderer to only care about rendering unique frames.	Apr 7 2020
8ce793235c93	eoinoneill/dkazakov	DLGAnimationRenderer - Use filterContainer utility to correctly filter…	Apr 7 2020
84e15f19e4ae	eoinoneill/dkazakov	Correction -- HDR assignment should always assign h265 profile...	Apr 7 2020
868aeb3ad43a	eoinoneill/dkazakov	Gave Animation Rendering its own Saved Export Configurations	Apr 7 2020
06b236db5be6	eoinoneill/dkazakov	Video tab and Image Sequence tab HDR synchronization fix.	Apr 7 2020
6e6ff093f5f9	eoinoneill/dkazakov	Animation Render Window Cleanup + Render Only Unique Frames Feature	Apr 7 2020
78d1d4578b1e	ramonmiranda/tymond	Change the order of tool icons in icon creator	Apr 7 2020
b7166f9c92a4	emmetoneill/dkazakov	Improved missing FFmpeg error message.	Apr 7 2020
f8a77bcd4144	rempt	Make searching by resource name case insensitive	Apr 7 2020
ac20248da4e1	dkazakov	Move implementation from the header file	Apr 7 2020
ef33ece75e4c	emmetoneill/dkazakov	KisNodeManager Added Sibling Selection Actions.	Apr 7 2020
672981dbdb0d	emmetoneill/dkazakov	Added simple headers to timeline context menus.	Apr 7 2020
7c9897fb410a	rempt	Remove the activation flags for the ten brushes script	Apr 7 2020
9ada309c9ace	rempt	Check pointers before dereferencing	Apr 7 2020
b453d18f7b1a	rempt	debug--	Apr 7 2020
d3b615e891b6	ognarb	fix: wrong date in appstream file	Apr 7 2020
47af10d11fe5	ognarb/rempt	Add releases information to AppStream file	Apr 7 2020
90d05a35bcfd	rempt	Fix appstream file	Apr 7 2020
ea68cde0f94b	rempt	Try to fix the liberapay address	Apr 6 2020
70f7f0321771	woltherav	Ensure that the preset icon for the brush settings dropdown changes on preset…	Apr 6 2020
5a1f66ff4ae7	l10n daemon script	SVN_SILENT made messages (.desktop file) - always resolve ours	Apr 5 2020

Changes (420)
Show All Changes

Very Large Commit

This commit is very large. Load each file individually.

				Path	Packages
	A			.github/FUNDING.yml
	M			.lgtm.yml
	M			3rdparty/README.md
	M			3rdparty/ext_gmic/CMakeLists.txt
	M			3rdparty/ext_gmic/desktop_icon.diff
	D			3rdparty/ext_gmic/gmic-qt-cmake.diff
	M			3rdparty/ext_gmic/no_threads.diff
	M			3rdparty/ext_openssl/CMakeLists.txt
	M			3rdparty/ext_qt/CMakeLists.txt
	M			CMakeLists.txt
	M			README.md
	M			benchmarks/KisAnimationRenderingBenchmark.cpp
	M			benchmarks/kis_mask_generator_benchmark.cpp
	V			krita/data/preset_icons/tool_icons/{00_01_eraser-mechanical.png ← eraser-mechanical.png}
	V			krita/data/preset_icons/tool_icons/{00_02_eraser-large.png ← eraser-large.png}
	V			krita/data/preset_icons/tool_icons/{00_03_eraser-hard.png ← eraser-hard.png}
	V			krita/data/preset_icons/tool_icons/{00_04_eraser-kneaded.png ← eraser-kneaded.png}
	V			krita/data/preset_icons/tool_icons/{01_01_mechanical-pencil.png ← mechanical-pencil.png}
	V			krita/data/preset_icons/tool_icons/{01_01_pencil-black-stone.png ← pencil-black-stone.png}
	V			krita/data/preset_icons/tool_icons/{01_02_pencil-double-ring.png ← pencil-double-ring.png}
	V			krita/data/preset_icons/tool_icons/{01_04_graphite.png ← graphite.png}
	V			krita/data/preset_icons/tool_icons/{02_01_charcoal-pencil-thin.png ← charcoal-pencil-thin.png}
	V			krita/data/preset_icons/tool_icons/{02_02_charcoal-pencil-medium.png ← charcoal-pencil-medium.png}
	V			krita/data/preset_icons/tool_icons/{02_03_charcoal-pencil-large.png ← charcoal-pencil-large.png}
	V			krita/data/preset_icons/tool_icons/{02_04_charcoal-block.png ← charcoal-block.png}
	V			krita/data/preset_icons/tool_icons/{03_01colored-pencil.png ← colored-pencil.png}
	V			krita/data/preset_icons/tool_icons/{03_02_chalk-square.png ← chalk-square.png}
	V			krita/data/preset_icons/tool_icons/{03_03_pastel.png ← pastel.png}
	V			krita/data/preset_icons/tool_icons/{04_01_technical-pen.png ← technical-pen.png}
	V			krita/data/preset_icons/tool_icons/{04_02_gel-pen.png ← gel-pen.png}
	V			krita/data/preset_icons/tool_icons/{04_03_inking_fine-line_tiny.png ← inking_fine-line_tiny.png}
	V			krita/data/preset_icons/tool_icons/{04_04_inking_fine-line_medium.png ← inking_fine-line_medium.png}
	V			krita/data/preset_icons/tool_icons/{04_05_ink-pen-atom.png ← ink-pen-atom.png}
	V			krita/data/preset_icons/tool_icons/{04_06_ink-G-pen.png ← ink-G-pen.png}
	V			krita/data/preset_icons/tool_icons/{04_07_inking_dynamic_pen.png ← inking_dynamic_pen.png}
	V			krita/data/preset_icons/tool_icons/{04_08_inking_dynamic_pen_though.png ← inking_dynamic_pen_though.png}
	V			krita/data/preset_icons/tool_icons/{04_09_inking_pen_bumpy.png ← inking_pen_bumpy.png}
	V			krita/data/preset_icons/tool_icons/{04_10_inking_pen_bumpy_though.png ← inking_pen_bumpy_though.png}
	V			krita/data/preset_icons/tool_icons/{04_11_inking_pen_calligraphic.png ← inking_pen_calligraphic.png}
	V			krita/data/preset_icons/tool_icons/{04_12_rigger-brush.png ← rigger-brush.png}
	V			krita/data/preset_icons/tool_icons/{04_13_inking_brush.png ← inking_brush.png}
	V			krita/data/preset_icons/tool_icons/{04_14_inking_brush_blurry.png ← inking_brush_blurry.png}
	V			krita/data/preset_icons/tool_icons/{04_15_ink-brush.png ← ink-brush.png}
	V			krita/data/preset_icons/tool_icons/{04_16_large-rounded-cut.png ← large-rounded-cut.png}
	V			krita/data/preset_icons/tool_icons/{04_17_ink-pen-glass.png ← ink-pen-glass.png}
	V			krita/data/preset_icons/tool_icons/{05_01_airbrush.png ← airbrush.png}
	V			krita/data/preset_icons/tool_icons/{05_02_thin-stylus-tablet.png ← thin-stylus-tablet.png}
	V			krita/data/preset_icons/tool_icons/{05_03_stylus-white.png ← stylus-white.png}
	V			krita/data/preset_icons/tool_icons/{05_04_stylus.png ← stylus.png}
	V			krita/data/preset_icons/tool_icons/{05_05_stylus-colored-ring.png ← stylus-colored-ring.png}
	V			krita/data/preset_icons/tool_icons/{05_06_stylus-colored.png ← stylus-colored.png}
	V			krita/data/preset_icons/tool_icons/{05_07_stylus-experimental.png ← stylus-experimental.png}
	V			krita/data/preset_icons/tool_icons/{06_01_marker.png ← marker.png}
	V			krita/data/preset_icons/tool_icons/{06_02_marker-old.png ← marker-old.png}
	V			krita/data/preset_icons/tool_icons/{06_03_marker-large.png ← marker-large.png}
	V			krita/data/preset_icons/tool_icons/{06_04_round_marker_detail.png ← round_marker_detail.png}
	V			krita/data/preset_icons/tool_icons/{06_05_sketching_wide_47.png ← sketching_wide_47.png}
	V			krita/data/preset_icons/tool_icons/{06_06_sketching_wide_bristles.png ← sketching_wide_bristles.png}
	V			krita/data/preset_icons/tool_icons/{07_01_synthetic-thin.png ← synthetic-thin.png}
	V			krita/data/preset_icons/tool_icons/{07_02_synthetic-medium.png ← synthetic-medium.png}
	V			krita/data/preset_icons/tool_icons/{07_03_synthetic-filbert.png ← synthetic-filbert.png}
	V			krita/data/preset_icons/tool_icons/{07_04_synthetic-large-bright.png ← synthetic-large-bright.png}
	V			krita/data/preset_icons/tool_icons/{07_05_synthetic-large-bright-used.png ← synthetic-large-bright-used.png}
	V			krita/data/preset_icons/tool_icons/{07_06_oil-filbert.png ← oil-filbert.png}
	V			krita/data/preset_icons/tool_icons/{07_07_oil-flat-large.png ← oil-flat-large.png}
	V			krita/data/preset_icons/tool_icons/{07_08_acrylic-rounded-used.png ← acrylic-rounded-used.png}
	V			krita/data/preset_icons/tool_icons/{07_09_acrylic-angled.png ← acrylic-angled.png}
	V			krita/data/preset_icons/tool_icons/{07_10_acrylic-flat.png ← acrylic-flat.png}
	V			krita/data/preset_icons/tool_icons/{07_11_acrylic-mop.png ← acrylic-mop.png}
	V			krita/data/preset_icons/tool_icons/{07_12_wide_dull_round.png ← wide_dull_round.png}
	V			krita/data/preset_icons/tool_icons/{07_13_wide_brush_blurry.png ← wide_brush_blurry.png}
	V			krita/data/preset_icons/tool_icons/{07_14_watercolor-flat.png ← watercolor-flat.png}
	V			krita/data/preset_icons/tool_icons/{07_15_acrylic-fan-used.png ← acrylic-fan-used.png}
	V			krita/data/preset_icons/tool_icons/{07_16_acrylic-flat-old.png ← acrylic-flat-old.png}
	V			krita/data/preset_icons/tool_icons/{07_17_synthetic-very-old.png ← synthetic-very-old.png}
	V			krita/data/preset_icons/tool_icons/{07_18_special-effect-used-brush.png ← special-effect-used-brush.png}
	V			krita/data/preset_icons/tool_icons/{08_01_watercolor-brush-medium.png ← watercolor-brush-medium.png}
	V			krita/data/preset_icons/tool_icons/{08_02_oil-round-hard.png ← oil-round-hard.png}
	V			krita/data/preset_icons/tool_icons/{08_03_sumi-e.png ← sumi-e.png}
	V			krita/data/preset_icons/tool_icons/{08_04_wide_brush_big.png ← wide_brush_big.png}
	V			krita/data/preset_icons/tool_icons/{09_01_blending-stump.png ← blending-stump.png}
	V			krita/data/preset_icons/tool_icons/{09_02_blur_soft.png ← blur_soft.png}
	V			krita/data/preset_icons/tool_icons/{09_03_knife.png ← knife.png}
	V			krita/data/preset_icons/tool_icons/{09_04_knife-rake.png ← knife-rake.png}
	V			krita/data/preset_icons/tool_icons/{09_05_paint-roller.png ← paint-roller.png}
	V			krita/data/preset_icons/tool_icons/{10_01_color-effect.png ← color-effect.png}
	V			krita/data/preset_icons/tool_icons/{10_02_adjustement-contrast.png ← adjustement-contrast.png}
	V			krita/data/preset_icons/tool_icons/{10_03_adjustement-dark.png ← adjustement-dark.png}
	V			krita/data/preset_icons/tool_icons/{10_04_filter.png ← filter.png}
	V			krita/data/preset_icons/tool_icons/{10_05_deform.png ← deform.png}
	V			krita/data/preset_icons/tool_icons/{10_06_clone.png ← clone.png}
	V			krita/data/preset_icons/tool_icons/{11_01_wand.png ← wand.png}
	V			krita/data/preset_icons/tool_icons/{11_02_shape.png ← shape.png}
	V			krita/data/preset_icons/tool_icons/{11_03_experimental.png ← experimental.png}
	V			krita/data/preset_icons/tool_icons/{11_03stamp.png ← stamp.png}
	V			krita/data/preset_icons/tool_icons/{11_04_texture-indicator.png ← texture-indicator.png}
	V			krita/data/preset_icons/tool_icons/{11_05_screentone-indicator.png ← screentone-indicator.png}
	V			krita/data/preset_icons/tool_icons/{11_06_grid.png ← grid.png}
	A			krita/data/preset_icons/tool_icons/12_01_Mechanical_Pencil.png
	A			krita/data/preset_icons/tool_icons/12_02_Fineliner.png
	A			krita/data/preset_icons/tool_icons/12_03_Marker_Permanent.png
	A			krita/data/preset_icons/tool_icons/12_04_PenBrush_01.png
	A			krita/data/preset_icons/tool_icons/12_05_Pen_01.png
	A			krita/data/preset_icons/tool_icons/12_06_Pen_02.png
	A			krita/data/preset_icons/tool_icons/12_07_Pen_03.png
	A			krita/data/preset_icons/tool_icons/12_08_Graphite_stick.png
	A			krita/data/preset_icons/tool_icons/12_09_Pastel_Bar_01.png
	A			krita/data/preset_icons/tool_icons/12_10_Pastel_Bar_04.png
	A			krita/data/preset_icons/tool_icons/12_11_Pastel_Bar_02.png
	M			krita/data/preset_icons/tool_icons/CMakeLists.txt
	V			krita/data/preset_icons/tool_icons/{acrylic-angled.png → 07_09_acrylic-angled.png}
	V			krita/data/preset_icons/tool_icons/{acrylic-fan-used.png → 07_15_acrylic-fan-used.png}
	V			krita/data/preset_icons/tool_icons/{acrylic-flat-old.png → 07_16_acrylic-flat-old.png}
	V			krita/data/preset_icons/tool_icons/{acrylic-flat.png → 07_10_acrylic-flat.png}
	V			krita/data/preset_icons/tool_icons/{acrylic-mop.png → 07_11_acrylic-mop.png}
	V			krita/data/preset_icons/tool_icons/{acrylic-rounded-used.png → 07_08_acrylic-rounded-used.png}
	V			krita/data/preset_icons/tool_icons/{adjustement-contrast.png → 10_02_adjustement-contrast.png}
	V			krita/data/preset_icons/tool_icons/{adjustement-dark.png → 10_03_adjustement-dark.png}
	V			krita/data/preset_icons/tool_icons/{airbrush.png → 05_01_airbrush.png}
	V			krita/data/preset_icons/tool_icons/{blending-stump.png → 09_01_blending-stump.png}
	V			krita/data/preset_icons/tool_icons/{blur_soft.png → 09_02_blur_soft.png}
	V			krita/data/preset_icons/tool_icons/{chalk-square.png → 03_02_chalk-square.png}
	V			krita/data/preset_icons/tool_icons/{charcoal-block.png → 02_04_charcoal-block.png}
	V			krita/data/preset_icons/tool_icons/{charcoal-pencil-large.png → 02_03_charcoal-pencil-large.png}
	V			krita/data/preset_icons/tool_icons/{charcoal-pencil-medium.png → 02_02_charcoal-pencil-medium.png}
	V			krita/data/preset_icons/tool_icons/{charcoal-pencil-thin.png → 02_01_charcoal-pencil-thin.png}
	V			krita/data/preset_icons/tool_icons/{clone.png → 10_06_clone.png}
	V			krita/data/preset_icons/tool_icons/{color-effect.png → 10_01_color-effect.png}
	V			krita/data/preset_icons/tool_icons/{colored-pencil.png → 03_01colored-pencil.png}
	V			krita/data/preset_icons/tool_icons/{deform.png → 10_05_deform.png}
	V			krita/data/preset_icons/tool_icons/{eraser-hard.png → 00_03_eraser-hard.png}
	V			krita/data/preset_icons/tool_icons/{eraser-kneaded.png → 00_04_eraser-kneaded.png}
	V			krita/data/preset_icons/tool_icons/{eraser-large.png → 00_02_eraser-large.png}
	V			krita/data/preset_icons/tool_icons/{eraser-mechanical.png → 00_01_eraser-mechanical.png}
	V			krita/data/preset_icons/tool_icons/{experimental.png → 11_03_experimental.png}
	V			krita/data/preset_icons/tool_icons/{filter.png → 10_04_filter.png}
	V			krita/data/preset_icons/tool_icons/{gel-pen.png → 04_02_gel-pen.png}
	V			krita/data/preset_icons/tool_icons/{graphite.png → 01_04_graphite.png}
	V			krita/data/preset_icons/tool_icons/{grid.png → 11_06_grid.png}
	V			krita/data/preset_icons/tool_icons/{ink-G-pen.png → 04_06_ink-G-pen.png}
	V			krita/data/preset_icons/tool_icons/{ink-brush.png → 04_15_ink-brush.png}
	V			krita/data/preset_icons/tool_icons/{ink-pen-atom.png → 04_05_ink-pen-atom.png}
	V			krita/data/preset_icons/tool_icons/{ink-pen-glass.png → 04_17_ink-pen-glass.png}
	V			krita/data/preset_icons/tool_icons/{inking_brush.png → 04_13_inking_brush.png}
	V			krita/data/preset_icons/tool_icons/{inking_brush_blurry.png → 04_14_inking_brush_blurry.png}
	V			krita/data/preset_icons/tool_icons/{inking_dynamic_pen.png → 04_07_inking_dynamic_pen.png}
	V			krita/data/preset_icons/tool_icons/{inking_dynamic_pen_though.png → 04_08_inking_dynamic_pen_though.png}
	V			krita/data/preset_icons/tool_icons/{inking_fine-line_medium.png → 04_04_inking_fine-line_medium.png}
	V			krita/data/preset_icons/tool_icons/{inking_fine-line_tiny.png → 04_03_inking_fine-line_tiny.png}
	V			krita/data/preset_icons/tool_icons/{inking_pen_bumpy.png → 04_09_inking_pen_bumpy.png}
	V			krita/data/preset_icons/tool_icons/{inking_pen_bumpy_though.png → 04_10_inking_pen_bumpy_though.png}
	V			krita/data/preset_icons/tool_icons/{inking_pen_calligraphic.png → 04_11_inking_pen_calligraphic.png}
	V			krita/data/preset_icons/tool_icons/{knife-rake.png → 09_04_knife-rake.png}
	V			krita/data/preset_icons/tool_icons/{knife.png → 09_03_knife.png}
	V			krita/data/preset_icons/tool_icons/{large-rounded-cut.png → 04_16_large-rounded-cut.png}
	V			krita/data/preset_icons/tool_icons/{marker-large.png → 06_03_marker-large.png}
	V			krita/data/preset_icons/tool_icons/{marker-old.png → 06_02_marker-old.png}
	V			krita/data/preset_icons/tool_icons/{marker.png → 06_01_marker.png}
	V			krita/data/preset_icons/tool_icons/{mechanical-pencil.png → 01_01_mechanical-pencil.png}
	V			krita/data/preset_icons/tool_icons/{oil-filbert.png → 07_06_oil-filbert.png}
	V			krita/data/preset_icons/tool_icons/{oil-flat-large.png → 07_07_oil-flat-large.png}
	V			krita/data/preset_icons/tool_icons/{oil-round-hard.png → 08_02_oil-round-hard.png}
	V			krita/data/preset_icons/tool_icons/{paint-roller.png → 09_05_paint-roller.png}
	V			krita/data/preset_icons/tool_icons/{pastel.png → 03_03_pastel.png}
	V			krita/data/preset_icons/tool_icons/{pencil-black-stone.png → 01_01_pencil-black-stone.png}
	V			krita/data/preset_icons/tool_icons/{pencil-double-ring.png → 01_02_pencil-double-ring.png}
	V			krita/data/preset_icons/tool_icons/{rigger-brush.png → 04_12_rigger-brush.png}
	V			krita/data/preset_icons/tool_icons/{round_marker_detail.png → 06_04_round_marker_detail.png}
	V			krita/data/preset_icons/tool_icons/{screentone-indicator.png → 11_05_screentone-indicator.png}
	V			krita/data/preset_icons/tool_icons/{shape.png → 11_02_shape.png}
	V			krita/data/preset_icons/tool_icons/{sketching_wide_47.png → 06_05_sketching_wide_47.png}
	V			krita/data/preset_icons/tool_icons/{sketching_wide_bristles.png → 06_06_sketching_wide_bristles.png}
	V			krita/data/preset_icons/tool_icons/{special-effect-used-brush.png → 07_18_special-effect-used-brush.png}
	V			krita/data/preset_icons/tool_icons/{stamp.png → 11_03stamp.png}
	V			krita/data/preset_icons/tool_icons/{stylus-colored-ring.png → 05_05_stylus-colored-ring.png}
	V			krita/data/preset_icons/tool_icons/{stylus-colored.png → 05_06_stylus-colored.png}
	V			krita/data/preset_icons/tool_icons/{stylus-experimental.png → 05_07_stylus-experimental.png}
	V			krita/data/preset_icons/tool_icons/{stylus-white.png → 05_03_stylus-white.png}
	V			krita/data/preset_icons/tool_icons/{stylus.png → 05_04_stylus.png}
	V			krita/data/preset_icons/tool_icons/{sumi-e.png → 08_03_sumi-e.png}
	V			krita/data/preset_icons/tool_icons/{synthetic-filbert.png → 07_03_synthetic-filbert.png}
	V			krita/data/preset_icons/tool_icons/{synthetic-large-bright-used.png → 07_05_synthetic-large-bright-used.png}
	V			krita/data/preset_icons/tool_icons/{synthetic-large-bright.png → 07_04_synthetic-large-bright.png}
	V			krita/data/preset_icons/tool_icons/{synthetic-medium.png → 07_02_synthetic-medium.png}
	V			krita/data/preset_icons/tool_icons/{synthetic-thin.png → 07_01_synthetic-thin.png}
	V			krita/data/preset_icons/tool_icons/{synthetic-very-old.png → 07_17_synthetic-very-old.png}
	V			krita/data/preset_icons/tool_icons/{technical-pen.png → 04_01_technical-pen.png}
	V			krita/data/preset_icons/tool_icons/{texture-indicator.png → 11_04_texture-indicator.png}
	V			krita/data/preset_icons/tool_icons/{thin-stylus-tablet.png → 05_02_thin-stylus-tablet.png}
	V			krita/data/preset_icons/tool_icons/{wand.png → 11_01_wand.png}
	V			krita/data/preset_icons/tool_icons/{watercolor-brush-medium.png → 08_01_watercolor-brush-medium.png}
	V			krita/data/preset_icons/tool_icons/{watercolor-flat.png → 07_14_watercolor-flat.png}
	V			krita/data/preset_icons/tool_icons/{wide_brush_big.png → 08_04_wide_brush_big.png}
	V			krita/data/preset_icons/tool_icons/{wide_brush_blurry.png → 07_13_wide_brush_blurry.png}
	V			krita/data/preset_icons/tool_icons/{wide_dull_round.png → 07_12_wide_dull_round.png}
	M			krita/data/shortcuts/krita_default.shortcuts
	M			krita/data/shortcuts/paint_tool_sai_compatible.shortcuts
	M			krita/data/shortcuts/photoshop_compatible.shortcuts
	M			krita/data/shortcuts/tablet_pro.shortcuts
	M			krita/data/templates/animation/.directory
	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/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/krita.action
	M			krita/org.kde.krita.appdata.xml
	M			kundo2_aware_xgettext.sh
	M			libs/brush/CMakeLists.txt
	A			libs/brush/KisColorfulBrush.cpp
	A			libs/brush/KisColorfulBrush.h
	M			libs/brush/kis_auto_brush.cpp
	M			libs/brush/kis_brush.cpp
	M			libs/brush/kis_brush.h
	M			libs/brush/kis_brushes_pipe.h
	M			libs/brush/kis_gbr_brush.cpp
	M			libs/brush/kis_gbr_brush.h
	M			libs/brush/kis_imagepipe_brush.cpp
	M			libs/brush/kis_imagepipe_brush.h
	M			libs/brush/kis_png_brush.cpp
	M			libs/brush/kis_png_brush.h
	M			libs/brush/kis_predefined_brush_factory.cpp
	P			libs/brush/kis_scaling_size_brush.cpp Copied to libs/pigment/KoAlphaMaskApplicatorFactoryImpl.h
	M			libs/brush/kis_text_brush.cpp
	M			libs/brush/tests/kis_imagepipe_brush_test.cpp
	M			libs/flake/KoDockRegistry.cpp
	M			libs/flake/KoFilterEffectRegistry.cpp
	M			libs/flake/KoInputDeviceHandlerRegistry.cpp
	M			libs/flake/KoRTree.h
	M			libs/flake/KoShapeFactoryBase.cpp
	M			libs/flake/KoShapeRegistry.cpp
	M			libs/flake/KoSvgPaste.cpp
	M			libs/flake/KoToolRegistry.cpp
	M			libs/flake/Mainpage.dox
	M			libs/global/KisUsageLogger.cpp
	M			libs/global/kis_algebra_2d.h
	M			libs/image/kis_base_node.cpp
	M			libs/image/kis_base_node.h
	M			libs/image/kis_brush_mask_applicator_base.h
	M			libs/image/kis_brush_mask_applicators.h
	M			libs/image/kis_layer_utils.cpp
	M			libs/image/tests/KisMaskGeneratorTest.cpp
	M			libs/image/tests/kis_mask_similarity_test.cpp
	M			libs/koplugin/CMakeLists.txt
	M			libs/koplugin/KoPluginLoader.cpp
	M			libs/koplugin/KoPluginLoader.h
	M			libs/libkis/Node.cpp
	M			libs/libkis/Node.h
	M			libs/libkis/PresetChooser.cpp
	M			libs/pigment/CMakeLists.txt
	A			libs/pigment/KoAlphaMaskApplicator.h
	A			libs/pigment/KoAlphaMaskApplicatorBase.cpp
	A			libs/pigment/KoAlphaMaskApplicatorBase.h
	A			libs/pigment/KoAlphaMaskApplicatorFactory.cpp
	A			libs/pigment/KoAlphaMaskApplicatorFactory.h
	A			libs/pigment/KoAlphaMaskApplicatorFactoryImpl.cpp
	P			libs/pigment/KoAlphaMaskApplicatorFactoryImpl.h Copied from libs/brush/kis_scaling_size_brush.cpp
	M			libs/pigment/KoColorModelStandardIdsUtils.h
	M			libs/pigment/KoColorSpace.cpp
	M			libs/pigment/KoColorSpace.h
	M			libs/pigment/KoColorSpaceAbstract.h
	A			libs/pigment/KoColorSpacePreserveLightnessUtils.h
	M			libs/pigment/KoColorSpaceRegistry.cpp
	M			libs/pigment/KoColorSpaceTraits.h
	M			libs/pigment/colorspaces/KoRgbU16ColorSpace.cpp
	M			libs/pigment/colorspaces/KoRgbU16ColorSpace.h
	M			libs/pigment/colorspaces/KoRgbU8ColorSpace.cpp
	M			libs/pigment/colorspaces/KoRgbU8ColorSpace.h
	M			libs/pigment/compositeops/KoCompositeOpFunctions.h
	M			libs/pigment/compositeops/KoStreamedMath.h
	M			libs/resources/KisResourceSearchBoxFilter.cpp
	M			libs/store/KoQuaZipStore.cpp
	M			libs/ui/KisApplication.cpp
	M			libs/ui/KisApplicationArguments.cpp
	M			libs/ui/KisApplicationArguments.h
	M			libs/ui/KisAsyncAnimationFramesSavingRenderer.cpp
	M			libs/ui/KisAsyncAnimationFramesSavingRenderer.h
	M			libs/ui/KisDocument.cpp
	M			libs/ui/KisReferenceImage.cpp
	M			libs/ui/KisView.cpp
	M			libs/ui/KisViewManager.cpp
	M			libs/ui/dialogs/KisAsyncAnimationFramesSaveDialog.cpp
	M			libs/ui/dialogs/KisAsyncAnimationFramesSaveDialog.h
	M			libs/ui/dialogs/kis_dlg_preferences.cc
	M			libs/ui/dialogs/kis_dlg_preferences.h
	M			libs/ui/forms/wdgcustompattern.ui
	M			libs/ui/forms/wdggeneralsettings.ui
	M			libs/ui/kis_config.cc
	M			libs/ui/kis_config.h
	M			libs/ui/kis_custom_pattern.cc
	M			libs/ui/kis_layer_manager.cc
	M			libs/ui/kis_node_manager.cpp
	M			libs/ui/kis_node_manager.h
	M			libs/ui/kis_png_converter.cpp
	M			libs/ui/kis_popup_palette.cpp
	M			libs/ui/kis_zoom_manager.cc
	M			libs/ui/kis_zoom_manager.h
	M			libs/ui/tests/kis_animation_exporter_test.cpp
	M			libs/ui/widgets/kis_iconwidget.cc
	M			libs/widgets/CMakeLists.txt
	M			libs/widgets/KisDlgInternalColorSelector.cpp
	M			libs/widgets/KisDlgInternalColorSelector.h
	A			libs/widgets/KisSpinboxHSXSelector.cpp
	A			libs/widgets/KisSpinboxHSXSelector.h
	M			libs/widgets/KisVisualColorSelector.cpp
	M			libs/widgets/KisVisualColorSelector.h
	M			libs/widgets/KisVisualColorSelectorShape.cpp
	M			libs/widgets/KisVisualColorSelectorShape.h
	M			libs/widgets/KisVisualEllipticalSelectorShape.cpp
	M			libs/widgets/KisVisualEllipticalSelectorShape.h
	M			libs/widgets/KisVisualRectangleSelectorShape.cpp
	M			libs/widgets/KisVisualRectangleSelectorShape.h
	M			libs/widgets/KisVisualTriangleSelectorShape.cpp
	M			libs/widgets/KisVisualTriangleSelectorShape.h
	M			libs/widgets/KoZoomAction.cpp
	M			libs/widgets/KoZoomAction.h
	M			libs/widgets/WdgDlgInternalColorSelector.ui
	M			libs/widgets/kis_spinbox_color_selector.cpp
	M			libs/widgetutils/kis_slider_spin_box.cpp
	M			packaging/linux/snap/snapcraft.yaml
	M			packaging/macos/osxbuild.sh
	M			packaging/macos/osxdeploy.sh
	M			plugins/assistants/Assistants/kis_assistant_tool.cc
	M			plugins/color/colorspaceextensions/kis_burnhighlights_adjustment.cpp
	M			plugins/color/colorspaceextensions/kis_burnmidtones_adjustment.cpp
	M			plugins/color/colorspaceextensions/kis_burnshadows_adjustment.cpp
	M			plugins/color/colorspaceextensions/kis_color_balance_adjustment.cpp
	M			plugins/color/colorspaceextensions/kis_desaturate_adjustment.cpp
	M			plugins/color/colorspaceextensions/kis_dodgehighlights_adjustment.cpp
	M			plugins/color/colorspaceextensions/kis_dodgemidtones_adjustment.cpp
	M			plugins/color/colorspaceextensions/kis_dodgeshadows_adjustment.cpp
	M			plugins/color/colorspaceextensions/krita_colorspaces_extensions_plugin.json
	M			plugins/color/lcms2engine/colorspaces/rgb_f16/RgbF16ColorSpace.cpp
	M			plugins/color/lcms2engine/colorspaces/rgb_f16/RgbF16ColorSpace.h
	M			plugins/color/lcms2engine/colorspaces/rgb_f32/RgbF32ColorSpace.cpp
	M			plugins/color/lcms2engine/colorspaces/rgb_f32/RgbF32ColorSpace.h
	M			plugins/color/lcms2engine/colorspaces/rgb_u16/RgbU16ColorSpace.cpp
	M			plugins/color/lcms2engine/colorspaces/rgb_u16/RgbU16ColorSpace.h
	M			plugins/color/lcms2engine/colorspaces/rgb_u8/RgbU8ColorSpace.cpp
	M			plugins/color/lcms2engine/colorspaces/rgb_u8/RgbU8ColorSpace.h
	M			plugins/color/lcms2engine/kolcmsengine.json
	M			plugins/dockers/animation/kis_animation_utils.cpp
	M			plugins/dockers/animation/kis_animation_utils.h
	M			plugins/dockers/animation/tests/timeline_model_test.cpp
	M			plugins/dockers/animation/timeline_docker.cpp
	M			plugins/dockers/animation/timeline_frames_index_converter.cpp
	M			plugins/dockers/animation/timeline_frames_model.cpp
	M			plugins/dockers/animation/timeline_frames_view.cpp
	M			plugins/dockers/animation/timeline_frames_view.h
	M			plugins/dockers/animation/timeline_node_list_keeper.cpp
	M			plugins/dockers/animation/timeline_ruler_header.cpp
	M			plugins/dockers/layerdocker/LayerBox.cpp
	M			plugins/dockers/svgcollectiondocker/svgcollectiondocker.json
	M			plugins/extensions/animationrenderer/AnimationRenderer.cpp
	M			plugins/extensions/animationrenderer/AnimationRenderer.h
	M			plugins/extensions/animationrenderer/DlgAnimationRenderer.cpp
	M			plugins/extensions/animationrenderer/DlgAnimationRenderer.h
	M			plugins/extensions/animationrenderer/KisAnimationRenderingOptions.cpp
	M			plugins/extensions/animationrenderer/KisAnimationRenderingOptions.h
	M			plugins/extensions/animationrenderer/video_export_options_dialog.cpp
	M			plugins/extensions/animationrenderer/video_export_options_dialog.h
	M			plugins/extensions/animationrenderer/wdg_animationrenderer.ui
	M			plugins/extensions/pykrita/sip/krita/Node.sip
	M			plugins/flake/artistictextshape/calligra_shape_artistictext.json
	M			plugins/flake/imageshape/calligra_shape_image.json
	M			plugins/flake/pathshapes/calligra_shape_paths.json
	M			plugins/flake/pathshapes/enhancedpath/EnhancedPathFormula.h
	M			plugins/flake/textshape/calligra_shape_text.json
	M			plugins/flake/textshape/kotext/KoInlineObjectRegistry.cpp
	M			plugins/flake/textshape/kotext/KoTextEditingRegistry.cpp
	M			plugins/flake/textshape/kotext/texteditingplugin.json
	M			plugins/impex/libkra/kis_kra_loader.cpp
	M			plugins/impex/libkra/kis_kra_savexml_visitor.cpp
	M			plugins/impex/libkra/tests/kis_kra_saver_test.cpp
	M			plugins/paintops/libpaintop/forms/wdgclipboardbrush.ui
	M			plugins/paintops/libpaintop/forms/wdgcustombrush.ui
	M			plugins/paintops/libpaintop/forms/wdgpredefinedbrushchooser.ui
	M			plugins/paintops/libpaintop/kis_brush_chooser.cpp
	M			plugins/paintops/libpaintop/kis_brush_chooser.h
	M			plugins/paintops/libpaintop/kis_clipboard_brush_widget.cpp
	M			plugins/paintops/libpaintop/kis_curve_option.cpp
	M			plugins/paintops/libpaintop/kis_curve_option.h
	M			plugins/paintops/libpaintop/kis_custom_brush_widget.cpp
	M			plugins/paintops/libpaintop/kis_dynamic_sensor.cc
	M			plugins/paintops/libpaintop/kis_pressure_hsv_option.cpp
	M			plugins/paintops/libpaintop/kis_pressure_rotation_option.cpp
	M			plugins/paintops/libpaintop/sensors/kis_dynamic_sensors.h
	M			plugins/python/colorspace/kritapykrita_colorspace.desktop
	M			plugins/python/comics_project_management_tools/comics_export_dialog.py
	M			plugins/python/comics_project_management_tools/comics_exporter.py
	M			plugins/python/comics_project_management_tools/comics_metadata_dialog.py
	M			plugins/python/comics_project_management_tools/comics_project_manager_docker.py
	M			plugins/python/comics_project_management_tools/exporters/CPMT_ACBF_XML_Exporter.py
	M			plugins/python/comics_project_management_tools/exporters/CPMT_CoMet_XML_Exporter.py
	M			plugins/python/comics_project_management_tools/exporters/CPMT_Comic_Rack_XML_Exporter.py
	M			plugins/python/comics_project_management_tools/exporters/CPMT_EPUB_exporter.py
	M			plugins/python/documenttools/kritapykrita_documenttools.desktop
	M			plugins/python/filtermanager/kritapykrita_filtermanager.desktop
	M			plugins/python/highpass/kritapykrita_highpass.desktop
	M			plugins/python/lastdocumentsdocker/kritapykrita_lastdocumentsdocker.desktop
	M			plugins/python/mixer_slider_docker/kritapykrita_mixer_slider_docker.desktop
	M			plugins/python/tenbrushes/kritapykrita_tenbrushes.desktop
	M			plugins/python/tenbrushes/tenbrushes.action
	M			plugins/python/tenscripts/kritapykrita_tenscripts.desktop
	M			plugins/tools/basictools/kis_tool_multihand.cpp
	M			plugins/tools/defaulttool/calligra_tool_defaults.json
	M			plugins/tools/karbonplugins/tools/karbon_tools.json
	M			plugins/tools/selectiontools/KisToolSelectMagnetic.cc
	M			plugins/tools/selectiontools/KisToolSelectMagnetic.h
	M			plugins/tools/svgtexttool/krita_tool_svgtext.json