Merge branch 'frameworks' into words-newsectionmodel-deniskup
Conflicts:
libs/kotext/KoTextEditor.cpp
Copyright changes conflict.
Description
Description
Details
Details
- Committed
deniskuplyakov Aug 6 2015, 5:07 PM - Parents
- R8:8cccd8aa14d9: Fixed unittest base doc creation and NewSectionCommand
R8:a975e3a7ad00: Merge remote-tracking branch 'origin' into frameworks - Branches
- Unknown
- Tags
Merged Changes
Merged Changes
| Commit | Author | Details | Committed | |||
|---|---|---|---|---|---|---|
| a975e3a7ad00 | rempt | Merge remote-tracking branch 'origin' into frameworks | Aug 5 2015 | |||
| 371ea2e189c0 | rempt | Fix linking the test | Aug 5 2015 | |||
| 085dc2b28dca | rempt | Merge branch 'calligra/2.9' | Aug 5 2015 | |||
| 4aaf71c3aad9 | rempt | XCF: load group layers from XCF files v3 or higher | Aug 5 2015 | |||
| c23342d2481e | rempt | fix build error after merge | Aug 5 2015 | |||
| ff9f91d86653 | rempt | remove prefixes for Qt includes | Aug 5 2015 | |||
| 2c2d8aaf746a | rempt | Don't prefix Qt includes | Aug 5 2015 | |||
| 6a8851fddfa0 | rempt | Remove KisOpenGLCanvas2::paintEvent | Aug 5 2015 | |||
| 7a088f356969 | rempt | Remove unused inline getter for textureId | Aug 5 2015 | |||
| 17b7dca8d0bd | timotheegiet | replace layerbox icons | Aug 5 2015 | |||
| 1e878da99458 | timotheegiet | replace tools icons | Aug 5 2015 | |||
| 5ca09dcf34ac | rempt | Merge branch 'calligra/2.9' | Aug 5 2015 | |||
| 102b8a432ff9 | D158 | abrahams | Fix isnan compiler defines in mingw builds | Aug 5 2015 | ||
| 994a8356c104 | D190 | abrahams | Shuffle OpenGL code for KisTextureTile | Aug 4 2015 | ||
| cf69d1e294ce | D234 | abrahams | Shuffle OpenGL code to ensure a context exists | Aug 4 2015 | ||
| e62445c952a2 | D233 | abrahams | Replace homebrew extension matcher with Qt Builtin | Aug 4 2015 | ||
| 51773e09feae | D232 | abrahams | Re-enable antialias for selection tools. | Aug 4 2015 | ||
| 4cbaa51fc95b | timotheegiet | replace icons, a lot | Aug 4 2015 | |||
| 8dd863eae8e6 | l10n daemon script | SVN_SILENT made messages (.desktop file) | Aug 4 2015 | |||
| 78da302b8e54 | timotheegiet | replace icons in preferences and misc | Aug 4 2015 | |||
| 9edad7204bca | l10n daemon script | SVN_SILENT made messages (after extraction) | Aug 4 2015 | |||
| 81aba9bacca3 | l10n daemon script | SVN_SILENT made messages (after extraction) | Aug 4 2015 | |||
| 8ddc10e93f43 | woltherav | Fix default argument declaration for Clang | Aug 3 2015 | |||
| 55a81f05c534 | timotheegiet | replace icons on several parts | Aug 3 2015 | |||
| de3a8f55f4c0 | timotheegiet | replace icons for bundle manager and reference docker | Aug 3 2015 | |||
| 4e111cc252a4 | Yuri Chornoivan | Fix minor typo | Aug 3 2015 | |||
| 6eb5712d1feb | timotheegiet | fix wrong ui theme | Aug 3 2015 | |||
| 44d283aaead4 | rempt | XCF: load group layers from XCF files v3 or higher | Aug 3 2015 | |||
| 8a93f90a0048 | l10n daemon script | SVN_SILENT made messages (.desktop file) | Aug 3 2015 | |||
| d634a69e5aba | Deevad | Update icon for trim-to-image | Aug 3 2015 | |||
| 4f86a2edfbdd | l10n daemon script | SVN_SILENT made messages (.desktop file) - always resolve ours | Aug 3 2015 | |||
| 402f1ab9a06c | woltherav | Merge in krita-testing-wolthera (squashed)(GSoC 2015) | Aug 2 2015 | |||
| 8c8b58c03c55 | sbrown | Add mathematically robust normal map combination blending mode. | Aug 1 2015 | |||
| 4ba770a31613 | timotheegiet | replace icons for composition docker | Jul 31 2015 | |||
| ba0c3606fea1 | timotheegiet | replace icons for Recording and Macros actions | Jul 31 2015 | |||
| d9981d2cab11 | timotheegiet | start replacing some icons | Jul 30 2015 | |||
| 07d591bd0ab3 | dkazakov | Update all the action icons when the theme is changed | Jul 30 2015 | |||
| 8570f238078c | abrahams | Workaround for Surface Pro 3 Eraser | Jul 30 2015 | |||
| 86211b5358fd | D195 | abrahams | Slow down updates for randomized brushes. | Jul 30 2015 | ||
| 7a2ca378b766 | l10n daemon script | SVN_SILENT made messages (after extraction) | Jul 30 2015 | |||
| b804a3560560 | l10n daemon script | SVN_SILENT made messages (after extraction) | Jul 30 2015 | |||
| 420c24c5727a | C. Boemann | Extend the KoTextVisitor with info about visiting tables and cell Code… | Jul 29 2015 | |||
| 1ef55a48d96f | C. Boemann | Fix wrtiting direction button not working the first time in some cases Had to… | Jul 29 2015 | |||
| 1d3684be07a1 | D154 | kossebau | Sanitize memory management of KoXmlNodeData a little | Jul 29 2015 | ||
| c68e00627fe5 | D196 | abrahams | Replace duplicated code for angle arithmetic | Jul 28 2015 | ||
| ecd17f1d96d1 | langkamp | added convert to shape for selections | Jul 28 2015 | |||
| 2ba6c5d1a64b | l10n daemon script | SVN_SILENT made messages (.desktop file) - always resolve ours | Jul 28 2015 | |||
| bf3b02ac8c7a | l10n daemon script | SVN_SILENT made messages (after extraction) | Jul 28 2015 | |||
| 08a1c52e815e | rempt | Update the xcftools to a newer version | Jul 27 2015 |
