Merge branch 'frameworks'
"master" is now Qt5/KF5-based, and the "frameworks" branch done & closed CCMAIL:calligra-devel@kde.org CCMAIL:kimageshop@kde.org CCMAIL:kexi-devel@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
Please register or sign in to comment