[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: =?utf-8?q?=5Bcalligra=5D_/=3A_Merge_branch_=27master=27_of_git?=
From: Jos van den Oever <jos () vandenoever ! info>
Date: 2011-06-06 12:34:06
Message-ID: 20110606123406.5A9F3A60A9 () git ! kde ! org
[Download RAW message or body]
Git commit 2111f46af4a793e545bc322355a5b189fa7b08a6 by Jos van den Oever.
Committed on 06/06/2011 at 14:33.
Pushed by vandenoever into branch 'master'.
Merge branch 'master' of git.kde.org:calligra
I +1 -1 braindump/src/View.cpp
I +1 -1 braindump/src/import/DockerManager.cpp
I +1 -1 braindump/src/import/DockerManager.h
I +32 -37 braindump/src/import/ToolDocker.cpp
I +5 -6 braindump/src/import/ToolDocker.h
I +1 -1 braindump/src/main.cpp
I +0 -70 filters/libmsooxml/MsooXmlCommonReaderDrawingMLImpl.h
I +1 -1 filters/tables/xlsx/ChartExport.cpp
I +1 -1 filters/tables/xlsx/XlsxImport.cpp
I +56 -56 filters/tables/xlsx/XlsxXmlChartReader.cpp
I +6 -6 filters/tables/xlsx/XlsxXmlCommentsReader.cpp
I +2 -2 filters/tables/xlsx/XlsxXmlCommonReader.cpp
I +11 -8 filters/tables/xlsx/XlsxXmlDocumentReader.cpp
I +3 -1 filters/tables/xlsx/XlsxXmlDocumentReader.h
I +11 -12 filters/tables/xlsx/XlsxXmlDrawingReader.cpp
I +2 -2 filters/tables/xlsx/XlsxXmlSharedStringsReader.cpp
I +21 -21 filters/tables/xlsx/XlsxXmlStylesReader.cpp
I +61 -10 filters/tables/xlsx/XlsxXmlWorksheetReader.cpp
I +4 -0 filters/tables/xlsx/XlsxXmlWorksheetReader.h
I +20 -0 krita/CMakeLists.txt
I +0 -6 krita/image/brushengine/kis_paintop_preset.h
I +1 -1 krita/image/kis_memory_leak_tracker.cpp
I +6 -2 krita/image/kis_paint_device.cc
I +7 -0 krita/image/kis_types.h
I +15 -9 krita/plugins/extensions/dockers/defaultdockers/kis_layer_box.cpp
I +1 -1 krita/plugins/extensions/dockers/defaultdockers/kis_layer_box.h
I +20 -32 krita/plugins/extensions/dockers/defaultdockers/wdglayerbox.ui
I +1 -1 krita/plugins/formats/psd/psd.h
I +4 -8 krita/plugins/formats/raw/kis_raw_import.cpp
I +2 -0 krita/plugins/paintops/colorsmudge/kis_colorsmudgeop_settings_widget.cpp
I +3 -1 krita/plugins/paintops/defaultpaintops/brush/kis_brushop_settings_widget.cpp
I +3 -1 krita/plugins/paintops/defaultpresets/CMakeLists.txt
I +- -- krita/plugins/paintops/defaultpresets/colorsmudge.kpp
I +- -- krita/plugins/paintops/defaultpresets/sketchbrush.kpp
I +16 -14 krita/plugins/paintops/libpaintop/CMakeLists.txt
I +0 -30 krita/plugins/paintops/libpaintop/SensorSelector.ui
I +30 -0 krita/plugins/paintops/libpaintop/forms/SensorSelector.ui
I +464 -0 krita/plugins/paintops/libpaintop/forms/wdgBrushSizeOptions.ui
I +76 -0 krita/plugins/paintops/libpaintop/forms/wdgCompositeOpOption.ui
I +53 -0 krita/plugins/paintops/libpaintop/forms/wdgairbrush.ui
I +331 -0 krita/plugins/paintops/libpaintop/forms/wdgautobrush.ui
I +63 -0 krita/plugins/paintops/libpaintop/forms/wdgbrushchooser.ui
I +228 -0 krita/plugins/paintops/libpaintop/forms/wdgcoloroptions.ui
I +184 -0 krita/plugins/paintops/libpaintop/forms/wdgcurveoption.ui
I +226 -0 krita/plugins/paintops/libpaintop/forms/wdgcustombrush.ui
I +83 -0 krita/plugins/paintops/libpaintop/forms/wdgfilteroption.ui
I +97 -0 krita/plugins/paintops/libpaintop/forms/wdgincremental.ui
I +24 -0 krita/plugins/paintops/libpaintop/forms/wdgmultisensorsselector.ui
I +139 -0 krita/plugins/paintops/libpaintop/forms/wdgtextbrush.ui
I +105 -0 krita/plugins/paintops/libpaintop/kis_compositeop_option.cpp
I +62 -0 krita/plugins/paintops/libpaintop/kis_compositeop_option.h
I +7 -0 krita/plugins/paintops/libpaintop/kis_curve_option_widget.cpp
I +37 -53 krita/plugins/paintops/libpaintop/kis_paintop_options_model.cpp
I +25 -20 krita/plugins/paintops/libpaintop/kis_paintop_options_model.h
I +30 -63 krita/plugins/paintops/libpaintop/kis_paintop_options_widget.cpp
I +3 -3 krita/plugins/paintops/libpaintop/kis_paintop_options_widget.h
I +0 -464 krita/plugins/paintops/libpaintop/wdgBrushSizeOptions.ui
I +0 -53 krita/plugins/paintops/libpaintop/wdgairbrush.ui
I +0 -331 krita/plugins/paintops/libpaintop/wdgautobrush.ui
I +0 -63 krita/plugins/paintops/libpaintop/wdgbrushchooser.ui
I +0 -228 krita/plugins/paintops/libpaintop/wdgcoloroptions.ui
I +0 -184 krita/plugins/paintops/libpaintop/wdgcurveoption.ui
I +0 -226 krita/plugins/paintops/libpaintop/wdgcustombrush.ui
I +0 -83 krita/plugins/paintops/libpaintop/wdgfilteroption.ui
I +0 -97 krita/plugins/paintops/libpaintop/wdgincremental.ui
I +0 -24 krita/plugins/paintops/libpaintop/wdgmultisensorsselector.ui
I +0 -139 krita/plugins/paintops/libpaintop/wdgtextbrush.ui
I +1 -1 krita/plugins/paintops/mypaint/brushlib/mapping.hpp
I +3 -1 krita/plugins/paintops/sketch/kis_sketch_paintop.cpp
I +4 -1 krita/ui/CMakeLists.txt
I +11 -4 krita/ui/dialogs/kis_dlg_layer_properties.cc
I +1 -1 krita/ui/dialogs/kis_dlg_layer_properties.h
I +8 -8 krita/ui/forms/wdglayerproperties.ui
I +122 -98 krita/ui/forms/wdgpaintopsettings.ui
I +144 -0 krita/ui/forms/wdgpresetselectorstrip.ui
I +47 -2 krita/ui/kis_canvas_resource_provider.cpp
I +15 -3 krita/ui/kis_canvas_resource_provider.h
I +66 -152 krita/ui/kis_categorized_item_delegate.cpp
I +16 -17 krita/ui/kis_categorized_item_delegate.h
I +292 -0 krita/ui/kis_categorized_list_model.h
I +12 -107 krita/ui/kis_composite_ops_model.cc
I +8 -32 krita/ui/kis_composite_ops_model.h
I +35 -79 krita/ui/kis_paint_ops_model.cpp
I +44 -47 krita/ui/kis_paint_ops_model.h
I +249 -402 krita/ui/kis_paintop_box.cc
I +78 -74 krita/ui/kis_paintop_box.h
I +2 -2 krita/ui/kis_view2.cpp
I +23 -11 krita/ui/kisexiv2/kis_exif_io.cpp
I +10 -22 krita/ui/tool/kis_tool_paint.cc
I +0 -2 krita/ui/tool/kis_tool_paint.h
I +42 -0 krita/ui/widgets/kis_categorized_list_view.cpp
I +60 -0 krita/ui/widgets/kis_categorized_list_view.h
I +50 -61 krita/ui/widgets/kis_cmb_composite.cc
I +22 -39 krita/ui/widgets/kis_cmb_composite.h
I +6 -8 krita/ui/widgets/kis_cmb_idlist.cc
I +4 -11 krita/ui/widgets/kis_cmb_idlist.h
I +0 -93 krita/ui/widgets/kis_cmb_paintop.cpp
I +0 -66 krita/ui/widgets/kis_cmb_paintop.h
I +80 -0 krita/ui/widgets/kis_paintop_list_widget.cpp
I +57 -0 krita/ui/widgets/kis_paintop_list_widget.h
I +6 -0 krita/ui/widgets/kis_paintop_presets_popup.cpp
I +1 -0 krita/ui/widgets/kis_paintop_presets_popup.h
I +29 -3 krita/ui/widgets/kis_preset_chooser.cpp
I +7 -1 krita/ui/widgets/kis_preset_chooser.h
I +136 -0 krita/ui/widgets/kis_preset_selector_strip.cpp
I +92 -0 krita/ui/widgets/kis_preset_selector_strip.h
I +1 -0 krita/ui/widgets/kis_scratch_pad.cpp
I +1 -1 libs/flake/KoCanvasController.h
I +20 -14 libs/flake/KoCanvasControllerWidget.cpp
I +1 -1 libs/flake/tests/TestSnapStrategy.cpp
I +1 -1 libs/kotext/KoText.h
I +1 -1 libs/kotext/KoTextDocument.cpp
I +1 -1 libs/kotext/changetracker/KoDeleteChangeMarker.h
I +2 -2 libs/kotext/styles/KoParagraphStyle.h
I +1 -1 libs/kotext/styles/KoTableCellStyle.h
I +1 -1 libs/kotext/styles/KoTableStyle.h
I +1 -1 libs/main/KoToolBoxLayout_p.h
I +5 -0 libs/pigment/KoColorSpace.cpp
I +5 -0 libs/pigment/KoColorSpace.h
I +180 -0 libs/pigment/KoCompositeOp.cpp
I +42 -1 libs/pigment/KoCompositeOp.h
I +18 -0 libs/widgets/KoResourceItemChooser.cpp
I +14 -5 libs/widgets/KoResourceItemChooser.h
I +25 -3 libs/widgets/KoResourceItemView.cpp
I +16 -1 libs/widgets/KoResourceItemView.h
I +133 -118 plugins/artistictextshape/ArtisticTextShape.cpp
I +3 -1 plugins/artistictextshape/ArtisticTextShape.h
I +46 -53 plugins/artistictextshape/ArtisticTextToolSelection.cpp
I +3 -3 plugins/textediting/thesaurus/README
I +2 -2 tables/dialogs/FormulaDialog.cpp
I +4 -4 tables/dialogs/ValidityDialog.cpp
I +0 -1 tables/part/View.cpp
I +1 -1 tools/kthesaurus/README
I +1 -1 tools/kthesaurus/main.cc
I +5 -2 words/part/frames/KWCopyShape.cpp
http://commits.kde.org/calligra/2111f46af4a793e545bc322355a5b189fa7b08a6
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic