Diffusion Calligra 436c4da34a94

Merge remote-tracking branch 'origin' into krita-opengl2-rempt
436c4da34a94
Actions

Authored by Boudewijn Rempt <boud@valdyas.org>.

Description

Merge remote-tracking branch 'origin' into krita-opengl2-rempt

Conflicts:
krita/ui/CMakeLists.txt

Details

Committed

Boudewijn Rempt <boud@valdyas.org>

Jun 21 2013, 12:34 PM

Parents

R8:fdfdf544984c: Merge remote-tracking branch 'origin/master' into krita-opengl2-rempt
R8:04a624e48781: Use updated color themes

Branches

Unknown

Tags

Unknown

Boudewijn Rempt <boud@valdyas.org> committed R8:436c4da34a94: Merge remote-tracking branch 'origin' into krita-opengl2-rempt (authored by Boudewijn Rempt <boud@valdyas.org>).Jun 21 2013, 12:34 PM

Merged Changes

Commit	Author	Details	Committed
04a624e48781	Boudewijn Rempt	Use updated color themes	Jun 21 2013
7bc0fd2e19a3	Boudewijn Rempt	FEATURE: Implement a global alpha lock "Preserve Layer Alpha"	Jun 21 2013
6d2c93ae697b	Boudewijn Rempt	warning--: unused param	Jun 21 2013
bcd4c3aa2d96	Boudewijn Rempt	Remove two unused methods from KisPainter api	Jun 21 2013
3eb8d53cec61	Boudewijn Rempt	warning--: unused params	Jun 21 2013
f36f18f94622	Boudewijn Rempt	Load the resultion information from the embedded PNG images	Jun 21 2013
4d3f35c50c45	Boudewijn Rempt	Rename openrastertk folder to ora	Jun 21 2013
68af838e9ece	Boudewijn Rempt	fix typo	Jun 21 2013
bac92afd7f10	Boudewijn Rempt	Fix spello	Jun 21 2013
778c3e273d60	Boudewijn Rempt	Remove unused variable	Jun 21 2013
5f3bc49530b3	Boudewijn Rempt	Change the image docker combobox to show common locations and drives	Jun 21 2013
cb28abc8d754	Friedrich W. H. Kossebau	Plan's MPXJ import filter does not use JNI currently, so disable check for JNI…	Jun 20 2013
7eb8a7497d59	Friedrich W. H. Kossebau	Make wdg_tool_crop.ui compatible with older Qt again	Jun 20 2013

Changes (44)

		Path
M		filters/plan/mpxj/CMakeLists.txt
M		filters/plan/mpxj/import/mpxjimport.cpp
M		krita/data/themes/Krita50.colors
M		krita/data/themes/KritaBlender.colors
M		krita/data/themes/KritaBright.colors
M		krita/data/themes/KritaBrighter.colors
M		krita/data/themes/KritaDark.colors
M		krita/data/themes/KritaDarker.colors
M		krita/image/kis_adjustment_layer.cc
M		krita/image/kis_painter.cc
M		krita/image/kis_painter.h
M		krita/plugins/extensions/dockers/imagedocker/forms/wdgimagedocker.ui
M		krita/plugins/extensions/dockers/imagedocker/imagedocker_dock.cpp
M		krita/plugins/extensions/dockers/imagedocker/imagedocker_dock.h
M		krita/plugins/filters/colorsfilters/colorsfilters.cpp
M		krita/plugins/formats/ora/CMakeLists.txt
M		krita/plugins/formats/ora/ora_load_context.cc
M		krita/plugins/formats/ora/ora_load_context.h
M		krita/plugins/paintops/colorsmudge/kis_colorsmudgeop.cpp
M		krita/plugins/tools/tool_crop/kis_tool_crop.cc
M		krita/plugins/tools/tool_crop/wdg_tool_crop.ui
M		krita/ui/CMakeLists.txt
M		krita/ui/kis_canvas_resource_provider.cpp
M		krita/ui/kis_canvas_resource_provider.h
M		krita/ui/kis_paintop_box.cc
M		krita/ui/kis_paintop_box.h
M		krita/ui/ko_favorite_resource_manager.cpp
D		krita/ui/openrastertk
V		krita/ui/{openrastertk → ora}/kis_open_raster_load_context.h
V		krita/ui/{openrastertk → ora}/kis_open_raster_save_context.h
V		krita/ui/{openrastertk → ora}/kis_open_raster_stack_load_visitor.cpp
V		krita/ui/{openrastertk → ora}/kis_open_raster_stack_load_visitor.h
V		krita/ui/{openrastertk → ora}/kis_open_raster_stack_save_visitor.cpp
V		krita/ui/{openrastertk → ora}/kis_open_raster_stack_save_visitor.h
A	(dir)	krita/ui/ora/
V		krita/ui/{ora ← openrastertk}/kis_open_raster_load_context.h
V		krita/ui/{ora ← openrastertk}/kis_open_raster_save_context.h
V		krita/ui/{ora ← openrastertk}/kis_open_raster_stack_load_visitor.cpp
V		krita/ui/{ora ← openrastertk}/kis_open_raster_stack_load_visitor.h
V		krita/ui/{ora ← openrastertk}/kis_open_raster_stack_save_visitor.cpp
V		krita/ui/{ora ← openrastertk}/kis_open_raster_stack_save_visitor.h
M		krita/ui/tool/kis_resources_snapshot.cpp
M		krita/ui/tool/kis_resources_snapshot.h
M		krita/ui/tool/strokes/kis_painter_based_stroke_strategy.cpp