On 11 March 2015 at 09:47, Boudewijn Rempt <b...@valdyas.org> wrote: > Please, do check these merge conflicts. I have assumed that the changes > in 2.9 were not needed in master, so I took the master branch version > of them. > > Conflicts: [..] > libs/db/expression.cpp
Looks OK, thanks. -- regards, Jaroslaw Staniek KDE: : A world-wide network of software engineers, artists, writers, translators : and facilitators committed to Free Software development - http://kde.org Calligra Suite: : A graphic art and office suite - http://calligra.org Kexi: : A visual database apps builder - http://calligra.org/kexi Qt Certified Specialist: : http://www.linkedin.com/in/jstaniek _______________________________________________ calligra-devel mailing list calligra-devel@kde.org https://mail.kde.org/mailman/listinfo/calligra-devel
