Merge branch 'krita/3.0'
fb1dfd65a481
Actions

Authored by rempt on Jun 13 2016, 7:44 AM.

Description

Merge branch 'krita/3.0'

Committed

rempt

Jun 13 2016, 7:44 AM

Parents

Branches

Unknown

Tags

Unknown

Commit	Author	Details	Committed
a17b0a585f33	timotheegiet/rempt	japanese animation template	Jun 13 2016
1985a9b29555	timotheegiet/rempt	fix krita icon svgz source	Jun 13 2016
4d8daa1c2d96	timotheegiet/rempt	new icon for krita document mimetype	Jun 13 2016
745804c4628c	timotheegiet/rempt	add some breeze color themes	Jun 13 2016
c24eecb6ba7e	rempt	BUG: 362064 Fix saving templates	Jun 9 2016
d0460855ea58	rempt	Remove unused member variable	Jun 9 2016
2dd26c598e1e	rempt	Histogram Improvements	Jun 9 2016
d469ae9abf25	timotheegiet/rempt	add document-properties icons	Jun 8 2016
0d89210e0a3d	kossebau	Readd appimage build files accidentally removed in…	Jun 7 2016
e3c50382e5d4	rempt	BUG:363769 Do not add double dots between filename and extension	Jun 7 2016
2872a8396478	rempt	Move KisBrushSizeOption to the deform brush	Jun 7 2016
6bc432f8d4e7	rempt	BUG:363845 Do not derefence a deleted point	Jun 7 2016

		Path
M		libs/pigment/KoBasicHistogramProducers.cpp
M		libs/pigment/KoBasicHistogramProducers.h
M		libs/pigment/KoHistogramProducer.cpp
M		libs/pigment/KoHistogramProducer.h
M		libs/ui/KisTemplateCreateDia.cpp
M		libs/ui/kis_histogram_view.cc
M		libs/ui/kis_histogram_view.h
M		libs/vectorimage/libwmf/WmfPainterBackend.cpp
M		libs/widgetutils/KoFileDialog.cpp
M		plugins/dockers/CMakeLists.txt
M		plugins/dockers/colorslider/kis_color_slider_widget.h
A	(dir)	plugins/dockers/histogram/
A		plugins/dockers/histogram/CMakeLists.txt
P		plugins/dockers/histogram/histogramdocker.cpp Copied from plugins/dockers/digitalmixer/digitalmixer.cc
P		plugins/dockers/histogram/histogramdocker.h Copied from plugins/dockers/patterndocker/patterndocker.h
A		plugins/dockers/histogram/histogramdocker_dock.cpp
P		plugins/dockers/histogram/histogramdocker_dock.h Copied from plugins/dockers/overview/overviewdocker_dock.h
P		plugins/dockers/histogram/krita_histogramdocker.json Copied from plugins/dockers/animation/krita_animationdocker.json
M		plugins/extensions/histogram/kis_histogram_widget.cc
M		plugins/extensions/histogram/kis_histogram_widget.h
M		plugins/paintops/deform/CMakeLists.txt
V		plugins/paintops/{deform ← libpaintop}/kis_brush_size_option.cpp
V		plugins/paintops/{deform ← libpaintop}/kis_brush_size_option.h
M		plugins/paintops/libpaintop/CMakeLists.txt
V		plugins/paintops/{libpaintop → deform}/kis_brush_size_option.cpp
V		plugins/paintops/{libpaintop → deform}/kis_brush_size_option.h