On Tue, Jul 30, 2013 at 4:20 AM, Sven Langkamp <sven.langk...@gmail.com>wrote:
> > * we keep a qt5 branch and regularly merge master to the qt5 branch. Big >> refactorings (komvc, build system changes) should only happen in the Qt5 >> branch. New features and bug fixes and gsoc results can be merged to master. >> > > I prefer the second one. That what be less a surprise for everyone running > master. To avoid much merge work we could put that in feature freeze for > bigger features and at some point merge the qt5 branch back. > Yes, this is a good idea. We would still be able to release bugfixes for Qt4 version this way. -- Dmitry Kazakov
_______________________________________________ calligra-devel mailing list calligra-devel@kde.org https://mail.kde.org/mailman/listinfo/calligra-devel