Skip to content
Snippets Groups Projects
Commit 86b1e170 authored by Friedrich W. H. Kossebau's avatar Friedrich W. H. Kossebau
Browse files

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
parents 324b21b7 c3c8863c
No related branches found
No related tags found
Loading
Showing
with 2 additions and 2324 deletions
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment