Build failed in Jenkins: calligra_master » All,LINBUILDER #1378

See Changes: [dener.kup] Fixed latest merge with calligra/2.9. -- [...truncated 13331 lines...] QByteArray encodedQueryItemValue(const QByteArray &key) const;

Build failed in Jenkins: calligra_master » NoOpenGL,LINBUILDER #1378

See Changes: [dener.kup] Fixed latest merge with calligra/2.9. -- [...truncated 7195 lines...] KDialogPrivate *const d_ptr;

Re: [calligra] /: Merge branch 'calligra/2.9'

>>> 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

Re: [calligra] /: Merge branch 'calligra/2.9'

On Wed, 11 Mar 2015, Денис Купляков wrote: 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 on

Re: [calligra] /: Merge branch 'calligra/2.9'

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 call

Build failed in Jenkins: calligra_master » All,LINBUILDER #1377

See Changes: [boud] Add png control files where possible [dimula73] Fix crash in KisPaintOpBox when creating a new view with a tablet [staniek] Kexi queries/parser: make SUBSTR(X, Y [, Z]) built-in SQL funct

Re: [calligra] /: Merge branch 'calligra/2.9'

On 11 March 2015 at 09:47, Boudewijn Rempt 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, Jaro

Build failed in Jenkins: calligra_master » NoOpenGL,LINBUILDER #1377

See Changes: [boud] Add png control files where possible [dimula73] Fix crash in KisPaintOpBox when creating a new view with a tablet [staniek] Kexi queries/parser: make SUBSTR(X, Y [, Z]) built-in SQL

[calligra] /: Merge branch 'calligra/2.9'

Git commit 6a68fb7ae32d97ba6330fb10c7e9843428e11f5f by Boudewijn Rempt. Committed on 11/03/2015 at 08:46. Pushed by rempt into branch 'master'. Merge branch 'calligra/2.9' CCMAIL: calligra-devel@kde.org Please, do check these merge conflicts. I have assumed that the changes in 2.9 were not neede