[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: =?utf-8?q?=5Bcalligra/flow-diagram-layout-yue=5D_/=3A_Merge_bran?=
From: Yue Liu <opuspace () gmail ! com>
Date: 2011-01-27 7:41:46
Message-ID: 20110127074146.7EEC3A60C4 () git ! kde ! org
[Download RAW message or body]
Git commit 060594ed2ed1e2b918c6ebf0bc4610d9f591b2b0 by Yue Liu.
Pushed by liu into branch 'flow-diagram-layout-yue'.
Merge branch 'master' of git://anongit.kde.org/calligra
I +5 -2 filters/kpresenter/pptx/PptxXmlSlideReader.cpp
I +2 -0 filters/libmsooxml/CMakeLists.txt
I +1 -1 filters/libmsooxml/ComplexShapeHandler.cpp
I +266 -25 filters/libmsooxml/MsooXmlCommonReaderDrawingMLImpl.h
I +5 -0 filters/libmsooxml/MsooXmlCommonReaderDrawingMLMethods.h
I +114 -0 filters/libmsooxml/MsooXmlDocumentTableStyle.cpp
I +76 -0 filters/libmsooxml/MsooXmlDocumentTableStyle.h
I +24 -19 filters/libmsooxml/MsooXmlDrawingReaderTableImpl.h
I +3 -3 filters/libmsooxml/MsooXmlDrawingReaderTableMethods.h
I +59 -214 filters/libmsooxml/MsooXmlDrawingTableStyle.cpp
I +26 -96 filters/libmsooxml/MsooXmlDrawingTableStyle.h
I +21 -16 filters/libmsooxml/MsooXmlDrawingTableStyleReader.cpp
I +5 -3 filters/libmsooxml/MsooXmlDrawingTableStyleReader.h
I +235 -0 filters/libmsooxml/MsooXmlTableStyle.cpp
I +159 -0 filters/libmsooxml/MsooXmlTableStyle.h
I +2 -0 filters/words/docx/DocxImport.cpp
I +206 -310 filters/words/docx/DocxXmlDocumentReader.cpp
I +21 -8 filters/words/docx/DocxXmlDocumentReader.h
I +13 -25 filters/words/docx/DocxXmlStylesReader.cpp
I +15 -10 filters/words/msword-odf/document.cpp
I +2 -2 filters/words/msword-odf/wv2/src/convert.cpp
I +2 -2 filters/words/msword-odf/wv2/src/generator/generator_wword6.htm
I +5 -5 filters/words/msword-odf/wv2/src/word95_generated.cpp
I +3 -3 filters/words/msword-odf/wv2/src/word95_generated.h
I +1 -1 kexi/kexidb/driver.cpp
I +3 -2 kexi/kexiutils/utils.cpp
I +1 -1 kexi/migration/mysql/mysqlmigrate.cpp
I +1 -1 kexi/migration/pqxx/pqxxmigrate.cpp
I +6 -1345 kplato/KPlatoXmlLoader.cpp
I +12 -68 kplato/KPlatoXmlLoader.h
I +2 -0 kplato/libs/kernel/CMakeLists.txt
I +1387 -0 kplato/libs/kernel/KPlatoXmlLoaderBase.cpp
I +104 -0 kplato/libs/kernel/KPlatoXmlLoaderBase.h
I +90 -67 kplato/libs/kernel/kptappointment.cpp
I +17 -4 kplato/libs/kernel/kptappointment.h
I +13 -16 kplato/libs/kernel/kptresource.cpp
I +4 -4 kplato/libs/kernel/kptschedule.cpp
I +14 -3 kplato/libs/kernel/kptschedule.h
I +163 -163 kplato/libs/kernel/tests/AppointmentIntervalTester.cpp
I +23 -23 kplato/libs/kernel/tests/CalendarTester.cpp
I +4 -4 kplato/libs/kernel/tests/debug.cpp
I +2 -2 kplato/libs/models/tests/ResourceModelTester.cpp
I +1 -1 kplato/libs/ui/kptganttitemdelegate.cpp
I +17 -15 kplato/plugins/schedulers/rcps/KPlatoRCPSScheduler.cpp
I +2 -2 kplato/plugins/scripting/Resource.cpp
I +9 -3 krita/image/commands/kis_layer_props_command.cpp
I +4 -1 krita/image/commands/kis_layer_props_command.h
I +1 -1 krita/image/kis_adjustment_layer.cc
I +2 -2 krita/image/kis_colorspace_convert_visitor.cpp
I +1 -0 krita/plugins/extensions/dockers/CMakeLists.txt
I +14 -0 krita/plugins/extensions/dockers/channeldocker/CMakeLists.txt
I +90 -0 krita/plugins/extensions/dockers/channeldocker/channeldocker.cpp
I +37 -0 krita/plugins/extensions/dockers/channeldocker/channeldocker.h
I +50 -0 krita/plugins/extensions/dockers/channeldocker/channeldocker_dock.cpp
I +39 -0 krita/plugins/extensions/dockers/channeldocker/channeldocker_dock.h
I +92 -0 krita/plugins/extensions/dockers/channeldocker/channelmodel.cpp
I +44 -0 krita/plugins/extensions/dockers/channeldocker/channelmodel.h
I +6 -0 krita/plugins/extensions/dockers/channeldocker/krita_channeldocker.desktop
I +1 -0 krita/plugins/formats/bmp/krita_bmp_import.desktop
I +1 -0 krita/plugins/formats/eps/krita_eps_export.desktop
I +1 -0 krita/plugins/formats/eps/krita_eps_import.desktop
I +1 -0 krita/plugins/formats/exr/krita_exr_export.desktop
I +1 -0 krita/plugins/formats/exr/krita_exr_import.desktop
I +1 -0 krita/plugins/formats/gif/krita_gif_export.desktop
I +1 -0 krita/plugins/formats/gif/krita_gif_import.desktop
I +1 -0 krita/plugins/formats/jp2/krita_jp2_export.desktop
I +1 -0 krita/plugins/formats/jp2/krita_jp2_import.desktop
I +1 -0 krita/plugins/formats/odg/krita_odg_import.desktop
I +1 -0 krita/plugins/formats/ppm/krita_ppm_export.desktop
I +1 -0 krita/plugins/formats/ppm/krita_ppm_import.desktop
I +1 -0 krita/plugins/formats/psd/krita_psd_export.desktop
I +1 -0 krita/plugins/formats/psd/krita_psd_import.desktop
I +1 -0 krita/plugins/formats/xcf/krita_xcf_import.desktop
I +5 -2 krita/ui/kis_layer_manager.cc
I +15 -5 krita/ui/kis_png_converter.cpp
I +57 -0 libs/odf/KoCellStyle.cpp
I +17 -0 libs/odf/KoCellStyle.h
I +3 -2 libs/odf/KoRawCellChild.cpp
I +2 -2 libs/odf/KoRawCellChild.h
I +7 -1 libs/odf/KoTable.cpp
I +1 -0 servicetypes/calligra_application.desktop
I +2 -0 tables/CMakeLists.txt
I +26 -0 tables/Sheet.cpp
I +4 -0 tables/Sheet.h
I +1 -1 tables/part/CanvasBase.h
I +82 -0 tables/part/CanvasItem.cpp
I +7 -0 tables/part/CanvasItem.h
I +1 -0 tables/tables.desktop
I +1 -0 tables/tables.notifyrc
I +1 -0 tables/tables_plugin.desktop
I +1 -1 words/Messages.sh
I +1 -0 words/part/words.desktop
I +1 -0 words/part/wordspart.desktop
http://commits.kde.org/47e7010d/060594ed2ed1e2b918c6ebf0bc4610d9f591b2b0
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic