Merge branch 'master' into rempt/T379-resource-management
42be937d5aed
Actions

Authored by rempt on Jun 7 2018, 7:21 AM.

Description

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

Committed

rempt

Jun 7 2018, 7:21 AM

Parents

Branches

Unknown

Tags

Unknown

Commit	Author	Details	Committed
5345be7d3d62	l10n daemon script	GIT_SILENT made messages (after extraction)	Jun 7 2018
b2ae65a74562	emmetoneill	Fixed Timeline's "Remove Frames/Columns and Pull" Actions.	Jun 6 2018
c2391e4f7072	scottpetrovic	Bump up vanishing point density to 180 degrees	Jun 6 2018
3f17d2f55186	scottpetrovic	Allow painting assistants to have their own color	Jun 6 2018
15efb84238ae	jounip	Fix "primary workspace follows focus" activation when creating window layout	Jun 6 2018
bedc6c9b3c32	jounip	Fix reference images disappearing when saving	Jun 6 2018
8d9ccd8d9253	dkazakov	Ask the user about the resolution he wants to use for loading SVG images	Jun 6 2018

				Path	Packages
	M			krita/org.kde.krita.appdata.xml
	M			libs/ui/flake/KisReferenceImagesLayer.cpp
	M			libs/ui/kis_config.cc
	M			libs/ui/kis_config.h
	M			libs/ui/kis_painting_assistant.cc
	M			libs/ui/kis_painting_assistant.h
	M			libs/ui/kis_painting_assistants_decoration.cpp
	M			libs/ui/kis_painting_assistants_decoration.h
	M			libs/ui/widgets/kis_workspace_chooser.cpp
	M			plugins/assistants/Assistants/AssistantsToolOptions.ui
	M			plugins/assistants/Assistants/SplineAssistant.cc
	M			plugins/assistants/Assistants/VanishingPointAssistant.cc
	M			plugins/assistants/Assistants/kis_assistant_tool.cc
	M			plugins/assistants/Assistants/kis_assistant_tool.h
	M			plugins/dockers/animation/kis_animation_curves_model.cpp
	M			plugins/dockers/animation/kis_animation_utils.cpp
	M			plugins/dockers/animation/kis_animation_utils.h
	M			plugins/dockers/animation/kis_time_based_item_model.cpp
	M			plugins/dockers/animation/kis_time_based_item_model.h
	M			plugins/dockers/animation/tests/kis_animation_utils_test.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/impex/svg/kis_svg_import.cc