[Kexi-devel] [calligra] karbon/stencils: Merge branch 'frameworks'

Sat Aug 29 14:09:29 UTC 2015

Git commit 86b1e17025e5ac3e1c83f520f86fa47441a637e1 by Friedrich W. H. Kossebau.
Committed on 29/08/2015 at 14:08.
Pushed by kossebau into branch 'master'.

Merge branch 'frameworks'

"master" is now Qt5/KF5-based, and the "frameworks" branch done & closed

CCMAIL:calligra-devel at kde.org
CCMAIL:kimageshop at kde.org
CCMAIL:kexi-devel at kde.org

# Conflicts:
#	libs/koreport/koreport_itemplugin.desktop
#	plugins/reporting/barcode/koreport_barcodeplugin.desktop
#	plugins/reporting/chart/koreport_chartplugin.desktop
#	plugins/reporting/maps/koreport_mapsplugin.desktop
#	plugins/reporting/web/koreport_webplugin.desktop

M  +0    -0    karbon/stencils/CMOS/gnd_h.desktop
M  +0    -0    karbon/stencils/CMOS/gnd_v.desktop
M  +0    -0    karbon/stencils/CMOS/nmos_h.desktop
M  +0    -0    karbon/stencils/CMOS/nmos_v.desktop
M  +0    -0    karbon/stencils/CMOS/pmos_h.desktop
M  +0    -0    karbon/stencils/CMOS/pmos_v.desktop
M  +0    -0    karbon/stencils/CMOS/vdd_h.desktop
M  +0    -0    karbon/stencils/CMOS/vdd_v.desktop
M  +0    -0    karbon/stencils/Cisco/wireless_transport.desktop
M  +0    -0    karbon/stencils/Cisco/wlan_controller.desktop
M  +0    -0    karbon/stencils/Cisco/woman.desktop
M  +0    -0    karbon/stencils/Cisco/woman_blue.desktop
M  +0    -0    karbon/stencils/Cisco/woman_gold.desktop
M  +0    -0    karbon/stencils/Cisco/woman_red.desktop
M  +0    -0    karbon/stencils/Cisco/workgroup_director.desktop
M  +0    -0    karbon/stencils/Cisco/workgroup_fcis.desktop
M  +0    -0    karbon/stencils/Cisco/workgroup_switch.desktop
M  +0    -0    karbon/stencils/Cisco/workgroup_switch_voice-enabled.desktop
M  +0    -0    karbon/stencils/Cisco/workstation.desktop
M  +0    -0    karbon/stencils/Cisco/www_server.desktop
M  +0    -0    karbon/stencils/Cybernetics/sine.desktop
M  +0    -0    karbon/stencils/Cybernetics/sum.desktop
M  +0    -0    karbon/stencils/Flags/china_hong_kong.desktop
M  +0    -0    karbon/stencils/Flags/china_macao.desktop
M  +0    -0    karbon/stencils/Flags/china_prc.desktop
M  +0    -0    karbon/stencils/Flags/china_roc.desktop
M  +0    -0    karbon/stencils/Flags/libyan_arab_jamahiriya.desktop
M  +0    -0    karbon/stencils/Gane_and_Sarson/alt-entity.desktop
M  +0    -0    karbon/stencils/Gane_and_Sarson/collection.desktop
M  +0    -0    karbon/stencils/Gane_and_Sarson/data_store.desktop
M  +0    -0    karbon/stencils/Gane_and_Sarson/entity.desktop
M  +0    -0    karbon/stencils/Jigsaw/collection.desktop
M  +0    -0    karbon/stencils/LST/cn_subsystem.desktop
M  +0    -0    karbon/stencils/LST/collection.desktop
M  +0    -0    karbon/stencils/LST/convert_subsystem.desktop
M  +0    -0    karbon/stencils/LST/decider_subsystem.desktop
M  +0    -0    karbon/stencils/LST/decoder.desktop
M  +0    -0    karbon/stencils/LST/distributor_subsystem.desktop
M  +0    -0    karbon/stencils/LST/encoder.desktop
M  +0    -0    karbon/stencils/LST/timer.desktop
M  +0    -0    karbon/stencils/Lights/ACL.desktop
M  +0    -0    karbon/stencils/Lights/Blacklight.desktop
M  +0    -0    karbon/stencils/MSE/small_extension_node.desktop
M  +0    -0    karbon/stencils/MSE/tacsat.desktop
M  +0    -0    karbon/stencils/Map/Corner1.desktop
M  +0    -0    karbon/stencils/Misc/collection.desktop
M  +0    -0    karbon/stencils/Network/dat_external.desktop
M  +0    -0    karbon/stencils/Network/disc.desktop
M  +0    -0    karbon/stencils/Network/flash.desktop
M  +0    -0    karbon/stencils/Network/genmonitor.desktop
M  +0    -0    karbon/stencils/Network/modularswitch.desktop
M  +0    -0    karbon/stencils/Network/monitor.desktop
M  +0    -0    karbon/stencils/Network/patch-panel.desktop
M  +0    -0    karbon/stencils/Network/pc_bigtower.desktop
M  +0    -0    karbon/stencils/Network/pc_miditower.desktop
M  +0    -0    karbon/stencils/Network/pc_minitower.desktop
M  +0    -0    karbon/stencils/Optics/dfb_laser.desktop
M  +0    -0    karbon/stencils/Optics/dfb_laser_vert.desktop
M  +0    -0    karbon/stencils/Optics/edfa.desktop
M  +0    -0    karbon/stencils/Optics/edfa_vert.desktop
M  +0    -0    karbon/stencils/Optics/fibre.desktop
M  +0    -0    karbon/stencils/Optics/fibre_vert.desktop
M  +0    -0    karbon/stencils/Optics/lpg.desktop
M  +0    -0    karbon/stencils/Optics/lpg_vert.desktop
M  +0    -0    karbon/stencils/RDP/collection.desktop
M  +0    -0    karbon/stencils/Racks/equipment_10u.desktop
M  +0    -0    karbon/stencils/Racks/equipment_11u.desktop
M  +0    -0    karbon/stencils/Racks/equipment_12u.desktop
M  +0    -0    karbon/stencils/Racks/equipment_1u.desktop
M  +0    -0    karbon/stencils/Racks/equipment_2u.desktop
M  +0    -0    karbon/stencils/Racks/equipment_3u.desktop
M  +0    -0    karbon/stencils/Racks/equipment_4u.desktop
M  +0    -0    karbon/stencils/Racks/equipment_5u.desktop
M  +0    -0    karbon/stencils/Racks/equipment_6u.desktop
M  +0    -0    karbon/stencils/Racks/equipment_7u.desktop
M  +0    -0    karbon/stencils/Racks/equipment_8u.desktop
M  +0    -0    karbon/stencils/Racks/equipment_9u.desktop
M  +0    -0    karbon/stencils/Renewable_Energy/collection.desktop
M  +0    -0    karbon/stencils/Renewable_Energy/data_logger.desktop
M  +0    -0    karbon/stencils/Renewable_Energy/meas_tower.desktop
M  +0    -0    karbon/stencils/Renewable_Energy/solar_module.desktop
M  +0    -0    karbon/stencils/Renewable_Energy/temp_humi_sensor.desktop
M  +0    -0    karbon/stencils/Renewable_Energy/wind_turbine.desktop
M  +0    -0    karbon/stencils/Renewable_Energy/wind_vane.desktop
M  +0    -0    karbon/stencils/SDL/collection.desktop
M  +0    -0    karbon/stencils/SDL/header.desktop
M  +0    -0    karbon/stencils/SDL/state.desktop
M  +0    -0    karbon/stencils/Scenegraph/subgraph.desktop
M  +0    -0    karbon/stencils/Scenegraph/switch.desktop
M  +0    -0    karbon/stencils/Scenegraph/transform.desktop
M  +0    -0    karbon/stencils/Sybase/dataserver.desktop
M  +0    -0    karbon/stencils/Sybase/repserver.desktop
M  +0    -0    karbon/stencils/Sybase/rsm.desktop
M  +0    -0    karbon/stencils/Sybase/stableq.desktop

http://commits.kde.org/calligra/86b1e17025e5ac3e1c83f520f86fa47441a637e1