intel-3
54735386f1f7
Actions

Authored by jounip on Feb 9 2018, 10:38 AM.

Description

Merge remote-tracking branch 'origin/master' into rempt/intel-3

Details

Committed

Feb 9 2018, 10:38 AM

Parents

R37:d06f40589d8d: Merge branch 'master' of git://anongit.kde.org/krita
R37:c44c18e8d087: Implement "Show active image in all windows" feature for window layouts

Branches

Unknown

Tags

Unknown

jounip committed R37:54735386f1f7: Merge remote-tracking branch 'origin/master' into rempt/intel-3 (authored by jounip).Feb 9 2018, 10:38 AM

Merged Changes

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

Commit		Author	Details	Committed
d06f40589d8d		Brendan Bd	Merge branch 'master' of git://anongit.kde.org/krita	Feb 9 2018
6dad1dd2ca67		Brendan Bd	Scripter scripts to execute in __name__ == "__main__"	Feb 9 2018
44265976fe9b		scottpetrovic	Update some brush preset icons with dry, fill, pencil, pixel	Feb 9 2018
ce8a5a4c8789		Brendan Bd	Execute scripter scripts in namespace __main__	Feb 8 2018
ed90df4588d7		woltherav	Adjust basic_chisel_smooth's scale to be a bit nicer and update icon.	Feb 8 2018
c5c29be62224		woltherav	Add preset emblems for tilt and various standard angles.	Feb 8 2018
afe6a62e2af6		woltherav	Update Eraser Preset Icons.	Feb 8 2018
1a90be0519a3		woltherav	Update Blender Preset with new icons.	Feb 8 2018
2bac1d5e1889		rempt	Make the scripter window a tool window.	Feb 8 2018
d1c053164df4		rempt	Debug--	Feb 8 2018
27ba395af739		rempt	Check all changed node properties when determining undo/redo	Feb 8 2018
5a8a65f01d8a		rempt	Fix installation of gmic-qt	Feb 8 2018
8844c732661b		rempt	debug--	Feb 8 2018
288a5e2afb28		rempt	Fix determining the format for a color value	Feb 8 2018
7b87e02da4b3	D10320	rempt	Add a pressure/angle option to the hatching brush engine	Feb 8 2018
6e52650d139c		scottpetrovic	use flat grey background for presets and add a grid preset to templates	Feb 8 2018
dafc730a8411		scottpetrovic	convert sketch presets to pencil. added a couple from Ramon. added curve engine…	Feb 8 2018
1729301b90b3		rempt	Do not disable the lut docker tests on windows or OSX	Feb 7 2018
205bbc939d83		rempt	Restore the SVG Library docker	Feb 7 2018
f35f5648acd4		dkazakov	Fix updates of shape layers when the image in transformed with size change	Feb 7 2018
1b9126cc7fa3		woltherav	More fixed to presets caused by brush renaming.	Feb 7 2018
0561e6105b20		rempt	Do not link to the lutdocker plugin: it's not a library	Feb 7 2018
dc112314ad36		rempt	Fix the install directory	Feb 7 2018
0c64dd443727		rempt	Try to implement a make install phase for gmic	Feb 7 2018
44277234fc71		rempt	Do not add imported layers to recent files	Feb 7 2018
56cf8f540bff		rempt	Add a desktop file and an icon to gmic-qt	Feb 7 2018
eeadf98b7ba0		rempt	Fix name of default workspace	Feb 7 2018
34bb24e19597		rempt	We got rid of the gmic dependency	Feb 6 2018
18b549c1ee54		dkazakov	Fix division in KisAlgebra2D::splitRectIntoPatches()	Feb 6 2018
015a08611e75		dkazakov	Add fuzziness to KisPainterTest::testMassiveBltFixedMultiTileWithOpacity()	Feb 6 2018
a7ac7236e971		dkazakov	Fix a crash in KisPainterTest	Feb 6 2018
0c33e5197a00		dkazakov	Fix cloning of KisSelectionBasedLayer	Feb 6 2018
4d26f23d0697	D10290	alvinhochun	Merge branch 'alvin/toolbox-layout'	Feb 6 2018
3744e5d39539		dkazakov	Fix leak of KisImage due to cycling shared pointers	Feb 6 2018
82b036eefd18		dkazakov	Remove leftovers of ReferencesTool	Feb 6 2018
c3113b6fca57		dkazakov	Fix duplication of the scaled shape layer	Feb 6 2018
14ff8d14296b		rempt	Use AppLocalDataLocation for the swap file on OSX	Feb 6 2018
f2ad5ab4cadf		dkazakov	Fix merging of two shape layers (also after scaling)	Feb 5 2018
53c9df77eb55		woltherav	Fix missing brush tip.	Feb 5 2018
28ed33405441		woltherav	Make all brushes greyscale so they don't have "color as mask" by default on.	Feb 5 2018
012554fe91c0		woltherav	Fix several brushes that got broken during the renames.	Feb 5 2018
dc7d04685c88		woltherav	Fix crash when saving authorinfo that has no contact info.	Feb 5 2018
676ab40dce15		alvinhochun	Fix overshoot offset when scrolling toolbox	Feb 4 2018
b2fe44748e2a		alvinhochun	Enable drag scrolling on toolbox	Feb 4 2018
5a376b0d792d		alvinhochun	Set toolbar orientation from widget geometry	Feb 4 2018
65d9309695c5		alvinhochun	Add scroll buttons to toolbox	Feb 4 2018
d444af7d20cd		alvinhochun	Change sizeHint of toolbox	Feb 4 2018
81c39388d0ef		alvinhochun	Wrap KoToolBox inside a scroll widget	Feb 4 2018
c627ead6e5d3		alvinhochun	Add param `notDryRun` to KoToolboxLayout::doLayout	Feb 4 2018
817b79253ba6		alvinhochun	Don't put toolbox section on last row of prev section	Feb 4 2018

Changes (409)
Show All Changes

Very Large Commit

This commit is very large. Load each file individually.

		Path
M		3rdparty/ext_gmic/CMakeLists.txt
A		3rdparty/ext_gmic/desktop_icon.diff
M		README_PACKAGERS.md
M		krita/data/actions/CMakeLists.txt
D		krita/data/actions/ReferencesTool.action
D		krita/data/brushes/3_brush.png
D		krita/data/brushes/3_dotted-flat.png
D		krita/data/brushes/3_eroded.gih
D		krita/data/brushes/3_splat.png
V		krita/data/brushes/{3_texture.png → square_rough.png}
D		krita/data/brushes/A_bamboo-leaves.gih
V		krita/data/brushes/{A_distant-mountain.gih → mountains_distant.gih}
D		krita/data/brushes/A_eroded-cercle-anim.gih
D		krita/data/brushes/A_eroded_circle.gih
V		krita/data/brushes/{A_grass-floor.gih → grass_patch.gih}
P		krita/data/brushes/A_pin.gih Deleted after being copied to multiple locations: krita/data/brushes/chisel_bent_rough.gih krita/data/brushes/sparkle.gbr
D		krita/data/brushes/A_smoke.gbr
V		krita/data/brushes/{A_snow-pack.gih → snow.gih}
D		krita/data/brushes/A_sparkle1.gbr
D		krita/data/brushes/A_sparkle2.gbr
D		krita/data/brushes/A_sparkle3.gbr
D		krita/data/brushes/A_splat2.gih
D		krita/data/brushes/A_starfield2.gbr
V		krita/data/brushes/{A_wall-texture.gih → brick.gih}
M		krita/data/brushes/CMakeLists.txt
V		krita/data/brushes/{Flat_textured1.gih → chalk_chisel.gih}
V		krita/data/brushes/{LJF_Water_Brush_02.gih → water_still.gih}
D		krita/data/brushes/MZ_leaves.gbr
D		krita/data/brushes/M_Pipe_1.gbr
V		krita/data/brushes/{N_Grass_2.gih → grass.gih}
D		krita/data/brushes/P_Graphite_Pencil_grain.gih
D		krita/data/brushes/R_Rake2.gbr
D		krita/data/brushes/R_Rake4.gbr
V		krita/data/brushes/{Rect_textured1.gih → rock_light.gih}
D		krita/data/brushes/Rect_textured2.gih
D		krita/data/brushes/Rect_textured3.gih
V		krita/data/brushes/{S_splats_02.gih → paint_splats.gih}
A		krita/data/brushes/abominable_snowman.png
A		krita/data/brushes/bamboo_leaves_random.gih
V		krita/data/brushes/{brick.gih ← A_wall-texture.gih}
A		krita/data/brushes/bristles_chisel_dense.png
A		krita/data/brushes/bristles_circle_dense.png
A		krita/data/brushes/bristles_circle_medium.png
A		krita/data/brushes/bristles_circle_random.gih
A		krita/data/brushes/bristles_circle_sparse.png
A		krita/data/brushes/bristles_circle_variable.svg
D		krita/data/brushes/cazu-chalk.gbr
D		krita/data/brushes/cazu-freckles.gbr
D		krita/data/brushes/cazu-reptile.gbr
D		krita/data/brushes/cazu-smear-paint.gbr
D		krita/data/brushes/cazu-spines.gbr
V		krita/data/brushes/{cazu_watercolor2.gih → watercolor.gih}
A		krita/data/brushes/chalk.png
V		krita/data/brushes/{chalk_chisel.gih ← Flat_textured1.gih}
A		krita/data/brushes/chalk_chisel_random.gih
A		krita/data/brushes/chalk_round_hard.png
A		krita/data/brushes/chalk_sparse.png
P		krita/data/brushes/chisel_bent_rough.gih Copied from krita/data/brushes/A_pin.gih
A		krita/data/brushes/chisel_dense_smear.png
A		krita/data/brushes/chisel_knife.svg
A		krita/data/brushes/circle_hard_eroded.gih
D		krita/data/brushes/double_special6.gih
D		krita/data/brushes/dub1.gbr
D		krita/data/brushes/dub6.gbr
A		krita/data/brushes/export.txt
A		krita/data/brushes/freckles.png
A		krita/data/brushes/gradient.png
A		krita/data/brushes/graphite_grain.gih
V		krita/data/brushes/{grass.gih ← N_Grass_2.gih}
V		krita/data/brushes/{grass_patch.gih ← A_grass-floor.gih}
V		krita/data/brushes/{hearts.gih ← w_hearts.gih}
D		krita/data/brushes/knife3.gbr
A		krita/data/brushes/leaves.png
V		krita/data/brushes/{mountains_distant.gih ← A_distant-mountain.gih}
D		krita/data/brushes/oil_bristle.gbr
A		krita/data/brushes/oil_bristle.png
D		krita/data/brushes/oil_knife.gbr
A		krita/data/brushes/oil_knife.png
V		krita/data/brushes/{paint_splats.gih ← S_splats_02.gih}
A		krita/data/brushes/rake_dense.png
A		krita/data/brushes/rake_sparse.png
D		krita/data/brushes/rock2.gbr
V		krita/data/brushes/{rock_light.gih ← Rect_textured1.gih}
A		krita/data/brushes/rock_pitted.gih
A		krita/data/brushes/rock_scraped.gih
D		krita/data/brushes/round_textured1.gbr
A		krita/data/brushes/scales.png
A		krita/data/brushes/scratches_rough.gih
D		krita/data/brushes/scribbles.gbr
A		krita/data/brushes/scribbles.png
A		krita/data/brushes/smear_paint.png
A		krita/data/brushes/smoke.png
V		krita/data/brushes/{snow.gih ← A_snow-pack.gih}
V		krita/data/brushes/{sparkle.gbr ← A_pin.gih}
A		krita/data/brushes/spines.png
V		krita/data/brushes/{square_rough.png ← 3_texture.png}
A		krita/data/brushes/starfield.png
D		krita/data/brushes/texture51.gbr
V		krita/data/brushes/{w_hearts.gih → hearts.gih}
V		krita/data/brushes/{water_still.gih ← LJF_Water_Brush_02.gih}
V		krita/data/brushes/{watercolor.gih ← cazu_watercolor2.gih}
D		krita/data/brushes/z_study_pencil_2H.gih
M		krita/data/paintoppresets/Basic_Chisel_Smooth.kpp
M		krita/data/paintoppresets/Blender_Basic.kpp
M		krita/data/paintoppresets/Blender_Blur.kpp
M		krita/data/paintoppresets/Blender_Mover.kpp
A		krita/data/paintoppresets/Blender_Mover_Tendrils.kpp
M		krita/data/paintoppresets/Blender_Rake.kpp
M		krita/data/paintoppresets/Blender_Textured.kpp
A		krita/data/paintoppresets/Blender_Textured_Marble.kpp
M		krita/data/paintoppresets/Blender_Water.kpp
A		krita/data/paintoppresets/Blender_Water_Sponge.kpp
M		krita/data/paintoppresets/CMakeLists.txt
M		krita/data/paintoppresets/Clone_Tool_Textured.kpp
M		krita/data/paintoppresets/Distort_Move.kpp
M		krita/data/paintoppresets/Dry_Bristles.kpp
M		krita/data/paintoppresets/Dry_Bristles_Eroded.kpp
M		krita/data/paintoppresets/Dry_Bristles_Smooth.kpp
M		krita/data/paintoppresets/Dry_Marker.kpp
M		krita/data/paintoppresets/Dry_Textured_Creases.kpp
M		krita/data/paintoppresets/Dry_Textured_Rough.kpp
M		krita/data/paintoppresets/Dry_Textured_Scribbles.kpp
M		krita/data/paintoppresets/Dry_Textured_Soft.kpp
M		krita/data/paintoppresets/Eraser_Airbrush.kpp
M		krita/data/paintoppresets/Eraser_Circle.kpp
M		krita/data/paintoppresets/Eraser_Hard.kpp
M		krita/data/paintoppresets/Eraser_Screentone.kpp
M		krita/data/paintoppresets/Eraser_Soft.kpp
A		krita/data/paintoppresets/FX_Pixelize.kpp
M		krita/data/paintoppresets/Fill_Large_Quick.kpp
M		krita/data/paintoppresets/Fill_Screentones.kpp
M		krita/data/paintoppresets/Fill_Shape.kpp
A		krita/data/paintoppresets/Ink_Bristle.kpp
A		krita/data/paintoppresets/Ink_Leaky.kpp
A		krita/data/paintoppresets/Pencil_2B.kpp
A		krita/data/paintoppresets/Pencil_6B.kpp
A		krita/data/paintoppresets/Pencil_Chrome.kpp
A		krita/data/paintoppresets/Pencil_Hatch_Noisy.kpp
A		krita/data/paintoppresets/Pencil_Pattern_Shading.kpp
A		krita/data/paintoppresets/Pencil_Pattern_Tilt.kpp
M		krita/data/paintoppresets/Pixel_Art.kpp
M		krita/data/paintoppresets/Pixel_Art_Dithering.kpp
D		krita/data/paintoppresets/Sketch_2B.kpp
D		krita/data/paintoppresets/Sketch_6B.kpp
D		krita/data/paintoppresets/Sketch_Chrome.kpp
D		krita/data/paintoppresets/Sketch_Hatch_Noisy.kpp
M		krita/data/paintoppresets/Stamp_Clouds.kpp
M		krita/data/paintoppresets/Stamp_Freckles.kpp
M		krita/data/paintoppresets/Stamp_Grass.kpp
M		krita/data/paintoppresets/Stamp_Grass_Patch.kpp
M		krita/data/paintoppresets/Stamp_Hearts.kpp
M		krita/data/paintoppresets/Stamp_Mountains_Distant.kpp
M		krita/data/paintoppresets/Stamp_Scales.kpp
M		krita/data/paintoppresets/Stamp_Spines.kpp
M		krita/data/paintoppresets/Stamp_Water.kpp
M		krita/data/paintoppresets/Stamp_Watercolor.kpp
M		krita/data/paintoppresets/Waterpaint_Hard_Edges.kpp
M		krita/data/paintoppresets/Waterpaint_Soft.kpp
M		krita/data/paintoppresets/Waterpaint_Soft_Edges.kpp
M		krita/data/paintoppresets/Wet_Bristles.kpp
M		krita/data/paintoppresets/Wet_Bristles_Rough.kpp
A		krita/data/paintoppresets/Wet_Bristles_Square.kpp
M		krita/data/paintoppresets/Wet_Circle.kpp
M		krita/data/paintoppresets/Wet_Smear.kpp
M		krita/data/paintoppresets/Wet_Soft_Tilted.kpp
M		krita/data/preset_icons/background.png
M		krita/data/preset_icons/emblem_icons/CMakeLists.txt
A		krita/data/preset_icons/emblem_icons/emblem_angle_10.png
A		krita/data/preset_icons/emblem_icons/emblem_angle_15.png
M		krita/data/preset_icons/emblem_icons/emblem_angle_30.png
A		krita/data/preset_icons/emblem_icons/emblem_angle_45.png
A		krita/data/preset_icons/emblem_icons/emblem_angle_60.png
A		krita/data/preset_icons/emblem_icons/emblem_angle_75.png
A		krita/data/preset_icons/emblem_icons/emblem_angle_90.png
A		krita/data/preset_icons/emblem_icons/emblem_tilt.png
M		krita/data/preset_icons/tool_icons/CMakeLists.txt
A		krita/data/preset_icons/tool_icons/grid.png
M		krita/data/templates/animation/.directory
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/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/web_design.desktop
M		krita/data/templates/dslr/.directory
M		krita/data/workspaces/Default.kws
M		krita/krita.action
M		krita/org.kde.krita.appdata.xml
M		krita/org.kde.krita.desktop
M		libs/flake/CMakeLists.txt
M		libs/flake/KoFrameShape.cpp
M		libs/flake/KoFrameShape.h
M		libs/flake/KoShapeManager.cpp
M		libs/flake/KoShapeManager.h
M		libs/flake/KoShapeManager_p.h
M		libs/flake/KoShapeRegistry.cpp
D		libs/flake/KoUnavailShape.cpp
D		libs/flake/KoUnavailShape.h
M		libs/flake/commands/KoShapeReorderCommand.cpp
M		libs/flake/commands/KoShapeReorderCommand.h
M		libs/flake/commands/KoShapeShadowCommand.cpp
M		libs/flake/svg/SvgShapeFactory.cpp
M		libs/flake/svg/SvgShapeFactory.h
M		libs/flake/tests/TestKoShapeRegistry.cpp
M		libs/flake/tests/TestKoShapeRegistry.h
A		libs/flake/tests/data/odf_frame_resource_store.zip
M		libs/global/CMakeLists.txt
M		libs/global/kis_algebra_2d.h
V		libs/{global ← image}/kis_thread_safe_signal_compressor.cpp
V		libs/{global ← image}/kis_thread_safe_signal_compressor.h
M		libs/image/CMakeLists.txt
M		libs/image/KisOptimizedByteArray.cpp
M		libs/image/brushengine/kis_paintop_utils.cpp
M		libs/image/commands/kis_node_property_list_command.cpp
M		libs/image/commands_new/kis_image_resize_command.cpp
M		libs/image/commands_new/kis_image_resize_command.h
M		libs/image/kis_image_config.cpp
M		libs/image/kis_layer_utils.cpp
M		libs/image/kis_painter.cc
M		libs/image/kis_properties_configuration.cc
M		libs/image/kis_selection_based_layer.cpp
V		libs/{image → global}/kis_thread_safe_signal_compressor.cpp
V		libs/{image → global}/kis_thread_safe_signal_compressor.h
M		libs/image/krita_utils.cpp
M		libs/image/tests/kis_algebra_2d_test.cpp
P		libs/image/tests/kis_algebra_2d_test.h Copied to plugins/paintops/hatching/kis_hatching_pressure_angle_option.cpp
M		libs/image/tests/kis_image_test.cpp
M		libs/image/tests/kis_painter_test.cpp
M		libs/image/tests/kis_properties_configuration_test.cpp
M		libs/image/tests/kis_transform_mask_test.cpp
M		libs/pigment/KoColor.h
M		libs/ui/KisDocument.cpp
M		libs/ui/KisDocument.h
M		libs/ui/KisMainWindow.cpp
M		libs/ui/flake/kis_shape_layer.cc
M		libs/ui/flake/kis_shape_layer_canvas.cpp
M		libs/ui/flake/kis_shape_layer_canvas.h
M		libs/ui/kis_import_catcher.cc
M		libs/ui/kis_png_converter.cpp
M		libs/ui/tests/CMakeLists.txt
A	(dir)	libs/ui/tests/data/shape_layer_test/
A		libs/ui/tests/data/shape_layer_test/merge_down_00_initial_layer_update.png
A		libs/ui/tests/data/shape_layer_test/merge_down_02_after_merge_down.png
A		libs/ui/tests/data/shape_layer_test/scale_and_clone_00_initial_layer_update.png
A		libs/ui/tests/data/shape_layer_test/scale_and_clone_01_after_scale_down.png
A		libs/ui/tests/data/shape_layer_test/scale_and_merge_down_00_initial_layer_update.png
A		libs/ui/tests/data/shape_layer_test/scale_and_merge_down_01_after_scale_down.png
A		libs/ui/tests/data/shape_layer_test/scale_and_merge_down_02_after_merge_down.png
M		libs/ui/tests/kis_file_layer_test.cpp
M		libs/ui/tests/kis_node_juggler_compressed_test.cpp
M		libs/ui/tests/kis_shape_commands_test.cpp
A		libs/ui/tests/kis_shape_layer_test.cpp
V		{libs/ui/tests/kis_shape_layer_test.h ← plugins/dockers/lut/lut_export.h}
M		libs/ui/widgets/kis_color_label_selector_widget.cpp
M		libs/widgets/KoDockWidgetTitleBar.cpp
M		libs/widgets/KoToolBox.cpp
M		libs/widgets/KoToolBoxDocker.cpp
M		libs/widgets/KoToolBoxDocker_p.h
M		libs/widgets/KoToolBoxLayout_p.h
A		libs/widgets/KoToolBoxScrollArea_p.h
M		libs/widgets/KoToolBox_p.h
M		packaging/linux/snap/setup/gui/krita.desktop
D		packaging/windows/build.bat
D		packaging/windows/build_krita.bat
M		plugins/dockers/CMakeLists.txt
M		plugins/dockers/lut/CMakeLists.txt
V		{plugins/dockers/lut/lut_export.h → libs/ui/tests/kis_shape_layer_test.h}
M		plugins/dockers/lut/ocio_display_filter.h
M		plugins/dockers/lut/tests/CMakeLists.txt
A	(dir)	plugins/dockers/svgcollectiondocker/
A		plugins/dockers/svgcollectiondocker/CMakeLists.txt
V		plugins/{dockers/svgcollectiondocker/Plugin.cpp ← flake/textshape/ReferencesToolFactory.h}
V		plugins/{dockers/svgcollectiondocker/Plugin.h ← flake/vectorshape/VectorShapePlugin.h}
A		plugins/dockers/svgcollectiondocker/SvgSymbolCollectionDocker.cpp
A		plugins/dockers/svgcollectiondocker/SvgSymbolCollectionDocker.h
A		plugins/dockers/svgcollectiondocker/WdgSvgCollection.ui
A		plugins/dockers/svgcollectiondocker/svgcollectiondocker.json
M		plugins/extensions/pykrita/plugin/plugins/assignprofiledialog/kritapykrita_assignprofiledialog.desktop
M		plugins/extensions/pykrita/plugin/plugins/colorspace/kritapykrita_colorspace.desktop
M		plugins/extensions/pykrita/plugin/plugins/comics_project_management_tools/kritapykrita_comics_project_management_tools.desktop
M		plugins/extensions/pykrita/plugin/plugins/documenttools/kritapykrita_documenttools.desktop
M		plugins/extensions/pykrita/plugin/plugins/exportlayers/kritapykrita_exportlayers.desktop
M		plugins/extensions/pykrita/plugin/plugins/filtermanager/kritapykrita_filtermanager.desktop
M		plugins/extensions/pykrita/plugin/plugins/hello/kritapykrita_hello.desktop
M		plugins/extensions/pykrita/plugin/plugins/lastdocumentsdocker/kritapykrita_lastdocumentsdocker.desktop
M		plugins/extensions/pykrita/plugin/plugins/palette_docker/kritapykrita_palette_docker.desktop
M		plugins/extensions/pykrita/plugin/plugins/quick_settings_docker/kritapykrita_quick_settings_docker.desktop
M		plugins/extensions/pykrita/plugin/plugins/scriptdocker/kritapykrita_scriptdocker.desktop
M		plugins/extensions/pykrita/plugin/plugins/scripter/scripterdialog.py
M		plugins/extensions/pykrita/plugin/plugins/scripter/ui_scripter/actions/runaction/runaction.py
M		plugins/extensions/pykrita/plugin/plugins/selectionsbagdocker/kritapykrita_selectionsbagdocker.desktop
M		plugins/extensions/pykrita/plugin/plugins/tenbrushes/kritapykrita_tenbrushes.desktop
M		plugins/extensions/pykrita/plugin/plugins/tenscripts/kritapykrita_tenscripts.desktop
M		plugins/flake/CMakeLists.txt
D		plugins/flake/textshape/AnnotationTextShape.cpp
D		plugins/flake/textshape/AnnotationTextShape.h
D		plugins/flake/textshape/AnnotationTextShapeFactory.cpp
D		plugins/flake/textshape/AnnotationTextShapeFactory.h
M		plugins/flake/textshape/CMakeLists.txt
D		plugins/flake/textshape/ChangeTracker.cpp
D		plugins/flake/textshape/ChangeTracker.h
D		plugins/flake/textshape/ReferencesTool.cpp
D		plugins/flake/textshape/ReferencesTool.h
D		plugins/flake/textshape/ReferencesToolFactory.cpp
V		plugins/{flake/textshape/ReferencesToolFactory.h → dockers/svgcollectiondocker/Plugin.cpp}
D		plugins/flake/textshape/ReviewTool.cpp
D		plugins/flake/textshape/ReviewTool.h
D		plugins/flake/textshape/ReviewToolFactory.cpp
D		plugins/flake/textshape/ReviewToolFactory.h
M		plugins/flake/textshape/TextPlugin.cpp
M		plugins/flake/textshape/TextShape.cpp
M		plugins/flake/textshape/TextShape.h
M		plugins/flake/textshape/TextTool.cpp
M		plugins/flake/textshape/TextToolFactory.cpp
D		plugins/flake/textshape/dialogs/CitationInsertionDialog.cpp
D		plugins/flake/textshape/dialogs/CitationInsertionDialog.h
D		plugins/flake/textshape/dialogs/CitationInsertionDialog.ui
D		plugins/flake/textshape/dialogs/InsertBibliographyDialog.cpp
D		plugins/flake/textshape/dialogs/InsertBibliographyDialog.h
D		plugins/flake/textshape/dialogs/InsertBibliographyDialog.ui
D		plugins/flake/textshape/dialogs/LinkInsertionDialog.cpp
D		plugins/flake/textshape/dialogs/LinkInsertionDialog.h
D		plugins/flake/textshape/dialogs/LinkInsertionDialog.ui
D		plugins/flake/textshape/dialogs/ManageBookmark.ui
D		plugins/flake/textshape/dialogs/ManageBookmarkDialog.cpp
D		plugins/flake/textshape/dialogs/ManageBookmarkDialog.h
D		plugins/flake/textshape/dialogs/NotesConfigurationDialog.cpp
D		plugins/flake/textshape/dialogs/NotesConfigurationDialog.h
D		plugins/flake/textshape/dialogs/NotesConfigurationDialog.ui
D		plugins/flake/textshape/dialogs/SimpleAnnotationWidget.cpp
D		plugins/flake/textshape/dialogs/SimpleAnnotationWidget.h
D		plugins/flake/textshape/dialogs/SimpleAnnotationWidget.ui
D		plugins/flake/textshape/dialogs/SimpleCaptionsWidget.cpp
D		plugins/flake/textshape/dialogs/SimpleCaptionsWidget.h
D		plugins/flake/textshape/dialogs/SimpleCaptionsWidget.ui
D		plugins/flake/textshape/dialogs/SimpleCitationBibliographyWidget.cpp
D		plugins/flake/textshape/dialogs/SimpleCitationBibliographyWidget.h
D		plugins/flake/textshape/dialogs/SimpleCitationBibliographyWidget.ui
D		plugins/flake/textshape/dialogs/SimpleFootEndNotesWidget.cpp
D		plugins/flake/textshape/dialogs/SimpleFootEndNotesWidget.h
D		plugins/flake/textshape/dialogs/SimpleFootEndNotesWidget.ui
D		plugins/flake/textshape/dialogs/SimpleLinksWidget.cpp
D		plugins/flake/textshape/dialogs/SimpleLinksWidget.h
D		plugins/flake/textshape/dialogs/SimpleLinksWidget.ui
D		plugins/flake/textshape/dialogs/SimpleSpellCheckingWidget.cpp
D		plugins/flake/textshape/dialogs/SimpleSpellCheckingWidget.h
D		plugins/flake/textshape/dialogs/SimpleSpellCheckingWidget.ui
D		plugins/flake/textshape/dialogs/SimpleTableOfContentsWidget.cpp
D		plugins/flake/textshape/dialogs/SimpleTableOfContentsWidget.h
D		plugins/flake/textshape/dialogs/SimpleTableOfContentsWidget.ui
D		plugins/flake/textshape/dialogs/SpecialButton.cpp
D		plugins/flake/textshape/dialogs/SpecialButton.h
D		plugins/flake/textshape/dialogs/StylesWidget.cpp
D		plugins/flake/textshape/dialogs/StylesWidget.h
D		plugins/flake/textshape/dialogs/StylesWidget.ui
M		plugins/flake/textshape/textlayout/KoTextShapeData.cpp
D		plugins/flake/vectorshape
D		plugins/flake/vectorshape/CMakeLists.txt
D		plugins/flake/vectorshape/ChangeVectorDataCommand.cpp
D		plugins/flake/vectorshape/ChangeVectorDataCommand.h
D		plugins/flake/vectorshape/VectorShape.cpp
D		plugins/flake/vectorshape/VectorShape.h
D		plugins/flake/vectorshape/VectorShapeConfigWidget.cpp
D		plugins/flake/vectorshape/VectorShapeConfigWidget.h
D		plugins/flake/vectorshape/VectorShapeFactory.cpp
D		plugins/flake/vectorshape/VectorShapeFactory.h
D		plugins/flake/vectorshape/VectorShapePlugin.cpp
V		plugins/{flake/vectorshape/VectorShapePlugin.h → dockers/svgcollectiondocker/Plugin.h}
D		plugins/flake/vectorshape/VectorTool.cpp
D		plugins/flake/vectorshape/VectorTool.h
D		plugins/flake/vectorshape/VectorToolFactory.cpp
D		plugins/flake/vectorshape/VectorToolFactory.h
D		plugins/flake/vectorshape/calligra_shape_vector.json
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/kis_jpeg_export.cc
M		plugins/impex/jpeg/krita_jpeg.desktop
M		plugins/impex/kra/kra_converter.cpp
M		plugins/impex/kra/krita_kra.desktop
M		plugins/impex/libkra/kis_kra_load_visitor.cpp
M		plugins/impex/libkra/tests/kis_kra_saver_test.cpp
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/svg/krita_svg.desktop
M		plugins/impex/tga/krita_tga.desktop
M		plugins/impex/tiff/krita_tiff.desktop
M		plugins/impex/xcf/krita_xcf.desktop
M		plugins/paintops/hatching/CMakeLists.txt
M		plugins/paintops/hatching/kis_hatching_paintop.cpp
M		plugins/paintops/hatching/kis_hatching_paintop.h
M		plugins/paintops/hatching/kis_hatching_paintop_settings.cpp
M		plugins/paintops/hatching/kis_hatching_paintop_settings.h
M		plugins/paintops/hatching/kis_hatching_paintop_settings_widget.cpp
P		plugins/paintops/hatching/kis_hatching_pressure_angle_option.cpp Copied from libs/image/tests/kis_algebra_2d_test.h
A		plugins/paintops/hatching/kis_hatching_pressure_angle_option.h
M		plugins/paintops/libpaintop/kis_curve_option.cpp
M		plugins/paintops/libpaintop/kis_curve_option_widget.cpp
M		sdk/tests/testutil.h