Merge branch 'master' into krita-scripting-rempt
Conflicts:
krita/krita.rc
krita/plugins/extensions/CMakeLists.txt
krita/ui/CMakeLists.txt
krita/ui/KisViewManager.h
krita/ui/kis_action.h
krita/ui/kis_view2.cpp
Description
Description
Details
Details
- Committed
cyrille May 2 2015, 2:05 PM - Parents
- R8:181a0545e353: fix order of colors for floating point (it is worth to note that photoshop…
R8:20ba40815026: Merge branch 'master' into krita-scripting-rempt - Branches
- Unknown
- Tags
Merged Changes
Merged Changes
| Commit | Author | Details | Committed | |||
|---|---|---|---|---|---|---|
| 181a0545e353 | cyrille | fix order of colors for floating point (it is worth to note that photoshop and… | May 2 2015 | |||
| d0f249c058b6 | cyrille | fix crash when opening grayscale floating point | May 2 2015 | |||
| 5713de0faa71 | rempt | Merge branch 'calligra/2.9' | May 2 2015 | |||
| f2d2406192e6 | rempt | Add a really late replying kickstarter backer :-) | May 2 2015 | |||
| fbce3564e888 | Thorsten Zachmann | Don't show all actions in slide sorter mode. | May 2 2015 | |||
| 2e52e2e21a12 | l10n daemon script | SVN_SILENT made messages (.desktop file) - always resolve ours | May 2 2015 | |||
| 87f504be3848 | rempt | Cache the number of favorite presets | May 1 2015 | |||
| 2cd81a60801d | rempt | Merge branch 'calligra/2.9' | May 1 2015 | |||
| c280bc7de488 | kossebau | Add TestKoXmlVector | May 1 2015 | |||
| c234c32b332a | kossebau | Add comment how KoXmlVector needs to be used | May 1 2015 | |||
| 9e4b7d21f40a | kossebau | Mark KoXmlVector members as mutable instead of const casting in operator[]( | May 1 2015 | |||
| 35b8de129512 | kossebau | Use m_ prefix for members of KoXmlVector | May 1 2015 | |||
| be118e9b0756 | kossebau | Move KoXmlVector into separate file | May 1 2015 | |||
| ecc51147cb2b | rempt | Remember the last chosen tag in the resource selectors | May 1 2015 | |||
| d40e5798ae76 | rempt | Simplify++ | May 1 2015 | |||
| 007292e82745 | rempt | BUG:346355 The tagging manager is used for more than just presets | May 1 2015 | |||
| 2e13aa8c61c4 | rempt | Add a default tag file for presets | May 1 2015 | |||
| 5783211294ec | rempt | BUG:345978 Save non-pat patterns in their native file format, not as .pat | May 1 2015 | |||
| 99445ee31df4 | rempt | debug-- | May 1 2015 | |||
| 8a97aeb83b4f | rempt | debug-- | May 1 2015 | |||
| 56af3e2a082c | rempt | Resource tagging: make the tag store track md5 sums/names, not objects | May 1 2015 | |||
| bf71f81be14d | rempt | Don't scare users who start krita on the command line | May 1 2015 | |||
| e87ac60cd041 | rempt | Add indexes for md5 -> tag and identifier -> tag | May 1 2015 | |||
| 6324e3f678e5 | rempt | Simplify the constructor of KoResourceTagStore | May 1 2015 | |||
| 2569d5142dbc | rempt | create d-pointer private class | May 1 2015 | |||
| 0e94c5de017b | rempt | whitespace | May 1 2015 | |||
| 7b5e4beecdda | rempt | Remove unused method | May 1 2015 | |||
| 9687d4dece2b | rempt | Hide the tag store from the KoResourceServer api | May 1 2015 | |||
| d4a24da810ec | rempt | BUG:346990 Don't crash if no pattern has been selected | May 1 2015 | |||
| 87d1f512ee0d | rempt | Coding style: m_ prefix for module-level variables | May 1 2015 | |||
| 196e1984ea05 | rempt | Allow breeze on platforms other than KDE as well | May 1 2015 | |||
| 64ee9a65d695 | rempt | Fix missing space | May 1 2015 | |||
| 817d0f76b55f | kossebau | Note removal of googledocs plugin in OBSOLETE.txt | Apr 30 2015 | |||
| 7834a2f80a1d | kossebau | Remove broken and for some time unbuild Google Docs plugin | Apr 30 2015 | |||
| 9d111c3d9719 | mmolch | Calculate the label's width in the specific color selector dock instead of… | Apr 30 2015 | |||
| 89068fce5a61 | mmolch | Calculate the label's width in the color slider dock instead of using a fixed… | Apr 30 2015 | |||
| 5a72a82f73a9 | mmolch | Don't set a default colorspace in the specific color selector dock | Apr 30 2015 | |||
| a65f8e0a8390 | mmolch | Fixed icons in file associations | Apr 30 2015 | |||
| 5ea998f85487 | staniek | unused-- | Apr 30 2015 | |||
| 564f9ee2ffb7 | dkazakov | Fix updates of Transparency Masks when they are moved | Apr 30 2015 | |||
| 020a0918b1f0 | Roman Shtemberko/staniek | Activate Design tab on switching to design mode | Apr 30 2015 | |||
| 94fceba4b20c | kossebau | Avoid one QString creation on every call | Apr 29 2015 | |||
| 4294dda0cde1 | kossebau | No need to use koIcon with non-literal icon names | Apr 29 2015 | |||
| bbea2ddf35cd | dkazakov | Fix compilation | Apr 29 2015 | |||
| cacb87d94777 | dkazakov | Fix crash in KisPainter::copyAreaOptimized() when selection is null :( | Apr 29 2015 | |||
| 2a3e773b06e6 | dkazakov | [NEED TESTING!] Make Krita loading even more faster | Apr 29 2015 | |||
| e1f73e09e04e | dkazakov | Strip embedded textures from all default presets! | Apr 29 2015 | |||
| f93a715b5a52 | dkazakov | [NEED TESTING FROM USERS!] A HUGE optimization for the merger framework | Apr 29 2015 | |||
| a564fc930b37 | dkazakov | Don't dump too much debug information | Apr 29 2015 | |||
| 039b58067e06 | dkazakov | Properly fix PsdAdditionalLayerInfoBlock | Apr 29 2015 |