Diffusion Krita 89fecee9c519

Merge remote-tracking branch 'origin' into frameworks

Authored by rempt on Aug 10 2015, 8:11 AM.

Description

Merge remote-tracking branch 'origin' into frameworks

Conflicts:
krita/plugins/paintops/libpaintop/kis_brush_chooser.cpp
libs/koreport/wrtembed/KoReportDesigner.cpp
plugins/reporting/chart/koreport_chartplugin.desktop
plugins/reporting/web/koreport_webplugin.desktop

Details

Committed
remptAug 10 2015, 8:11 AM
Parents
R37:303f6d667e03: Another OpenGL initialization check.
R37:66df0c7be6fd: Merge branch 'calligra/2.9'
Branches
Unknown
Tags
Unknown

Merged Changes

CommitAuthorDetailsCommitted
66df0c7be6fdrempt
Merge branch 'calligra/2.9' 
Aug 10 2015
ae1ac745f2d2l10n daemon script
SVN_SILENT made messages (.desktop file) 
Aug 10 2015
85a7d7e5443cstefanobonicatti
Brush editor crash fix 
Aug 9 2015
21f61f135c74l10n daemon script
SVN_SILENT made messages (after extraction) 
Aug 9 2015
d9e52f858273staniek
Kexi reports: typo in 'report:custom-page-width' 
Aug 8 2015
47ef886f1b46stefanobonicatti
Brush editor Stamp and Clipboard refactoring 
Aug 8 2015
e387267f0270l10n daemon script
SVN_SILENT made messages (.desktop file) 
Aug 8 2015
376f0fb1f9adrempt
BUG:337274 Filter the whole active node 
Aug 8 2015
abaa4caaa3c8rempt
Rephrase warning a little 
Aug 8 2015
3e3ba9e98801l10n daemon script
SVN_SILENT made messages (after extraction) 
Aug 8 2015
10dd54007cc5l10n daemon script
SVN_SILENT made messages (.desktop file) - always resolve ours 
Aug 8 2015
b9dc153957efdkazakov
Added a warning when the user activated a "pierced" brush in Dulling mode 
Aug 7 2015
72632a07865brempt
BUG:351060 Don't crash when painting in the scratchpad 
Aug 7 2015
3d4bb9e2140dtimotheegiet
fix docker_lock icons order 
Aug 7 2015
ea209d0e517drempt
BUG:350650 Do not abort when saving jpeg2000 
Aug 7 2015
72734a3986bfrempt
Add loading 8, 16, 32 bits grayscale and 32 bits rgb psd 
Aug 7 2015
bdf8194cb7badkazakov
Be more accurate when merging two layers having a different color space 
Aug 7 2015
7b5ad440b60cl10n daemon script
SVN_SILENT made messages (.desktop file) - always resolve ours 
Aug 7 2015
d54cac026951dkazakov
Fix the order of merging multiple layers down 
Aug 6 2015
2171b6877ad4rempt
BUG:351005 Don't crash on closing krita if the filter manager is open 
Aug 6 2015
d8d248292e6ftimotheegiet
replace layer options icons 
Aug 6 2015
3cd3431902ebdkazakov/rempt
Fix a memory leak in KisWeakSharedPtr 
Aug 6 2015
e4dadd0cdf3erempt
Revert "Use the KisColorTransformationConfiguration" 
Aug 6 2015
f4b80f72646frempt
Fix build 
Aug 6 2015
93f8c217ec47rempt
add Pasquale D'Antuono as donor 
Aug 6 2015
fd86270babb7rempt
Open the Krita Manual on F1 on all platforms 
Aug 6 2015
05e627a9899fl10n daemon script
SVN_SILENT made messages (.desktop file) 
Aug 6 2015
b1acc47efa9cl10n daemon script
SVN_SILENT made messages (.desktop file) - always resolve ours 
Aug 6 2015
e716a84ebc0bheikobecker
Merge remote-tracking branch 'origin/calligra/2.9' 
Aug 5 2015
d7764be48146heikobecker
Use DATA_INSTALL_DIR instead of INSTALL_PREFIX/share 
Aug 5 2015
cac04c779c21timotheegiet
replace selection visibility icons and lot of cleanup 
Aug 5 2015
19dcf44dc216timotheegiet
more icons cleanup 
Aug 5 2015