Hey! > Conflicts: > libs/kotext/KoSection.cpp > libs/kotext/KoSectionManager.cpp > libs/kotext/KoSectionManager.h This three above should be in master version, so result is OK.
> libs/kotext/commands/DeleteCommand.cpp This one contains fixes made by me only in calligra/2.9 (I hope there will be no conflicts when merging with master), so we need to leave calligra/2.9 version. > words/part/dockers/KWDebugWidget.cpp This one is more complex, need to port from calligra/2.9 only this "if (m_canvas).." changes, to prevent crash of debug widget on start (it is not user-visible and is build only on DEBUG configuration). Should I make fixes to master by myself? Also I've found some unneeded change in libs/kotext/tests/TestKoTextEditor.cpp, will fix it in calligra/2.9 and hope it will be merged back to master sometime. Is it OK? Denis Kuplyakov. _______________________________________________ calligra-devel mailing list calligra-devel@kde.org https://mail.kde.org/mailman/listinfo/calligra-devel
