Merge branch 'master' into Aniketh/T6108-Integrate-with-share.krita.org
Description
Description
Details
Details
- Committed
anikethgirish Jul 6 2017, 11:20 AM - Parents
- R37:96e3a1cc872b: Fix build on OSX
R37:ab296318eca5: Tweaking the UI of content manager according to the Mockup - Branches
- Unknown
- Tags
Merged Changes
Merged Changes
| Commit | Author | Details | Committed | |||
|---|---|---|---|---|---|---|
| 96e3a1cc872b | rempt | Fix build on OSX | Jul 6 2017 | |||
| 305cc8e2cdb8 | rempt | Fix build on OSX with clang | Jul 6 2017 | |||
| 76cdbaa42437 | rempt | use unix sepators | Jul 5 2017 | |||
| cb88cb81d716 | rempt | Clarify instructions | Jul 5 2017 | |||
| 6cd7b1112b06 | D6461 | allenmarshall | Fixed loading of spacing configuration when switching between presets | Jul 3 2017 | ||
| 6d63543bb3b8 | D6463 | allenmarshall | Disable freehand stroke timeout when airbrushing | Jul 3 2017 | ||
| 8c8ed9ae4ed5 | rempt | Merge branch 'rempt/touch-paint-4' | Jul 3 2017 | |||
| 047f02a1dbf5 | rempt | Fix type in the import/export json | Jul 3 2017 | |||
| 6a356aad8868 | rempt | Let the qimage-based import filter also load .ico | Jul 3 2017 | |||
| 3e75ebaab60b | scottpetrovic | BUG:381761 fix touch event crash when the touch event is over | Jul 2 2017 | |||
| 31b678c848e7 | D6448 | allenmarshall | Initialization of drawing angle for Polygon and Polyline tools | Jul 1 2017 | ||
| 46d377c26c48 | rempt | Merge remote-tracking branch 'origin' into rempt/touch-paint-4 | Jul 1 2017 | |||
| 7ae3c7aea748 | rempt | Check before saving to psd that the image is not bigger than 30000x3000 | Jul 1 2017 | |||
| 2bacb5e1f691 | rempt | Fix blocking/unblocking the mouse events | Jul 1 2017 | |||
| 6e2b1ea23d78 | rempt | Add support for PSB files | Jul 1 2017 | |||
| c1afeca44842 | rempt | fix setting the default for enabling touch painting | Jun 30 2017 | |||
| 5bcfac04fe45 | rempt | debug-- | Jun 30 2017 | |||
| a4178aca79e4 | rempt | Fix Q_SLOTS declaration | Jun 30 2017 | |||
| 53cd028ed74e | rempt | Merge branch 'master' into rempt/touch-paint-4 | Jun 30 2017 | |||
| fb401685804d | allenmarshall | Merge branch 'allenmarshall/movable-airbrush' GUI: Differential Revision: https… | Jun 30 2017 | |||
| 72f1546aa8b4 | l10n daemon script | GIT_SILENT made messages (after extraction) | Jun 30 2017 | |||
| 4915630e5a0a | scottpetrovic | fix a bug that was causing the canvas to jump when opening up the popup palette | Jun 29 2017 | |||
| 9e57f7528a56 | nicholasl | debug-- | Jun 29 2017 | |||
| e9a71be36a7f | nicholasl | gmic-qt - Only resize canvas when resulting image is larger | Jun 29 2017 | |||
| cd11c0e7ea08 | D2809 | rempt | Put all workspaces in the Windows menu as well | Jun 29 2017 | ||
| 877845202359 | D6399 | rempt | PSD import: Check whether the resolution info is not zero | Jun 29 2017 | ||
| a1863a80f0f3 | rempt | Make it possible to enable finger-painting | Jun 29 2017 | |||
| 0d12acee6b67 | rempt | Remove unused method | Jun 29 2017 | |||
| 382477d5fe71 | rempt | Remove tangle of #defines | Jun 29 2017 | |||
| 2ddb43345aad | rempt | Forward the double-click event to the tool | Jun 29 2017 | |||
| 68457c3d2fe6 | woltherav | Fix a crash in split layer. | Jun 27 2017 | |||
| 9f36f1636775 | D6314 | woltherav | Change the way how paintops are saved. | Jun 27 2017 | ||
| 7fcb82a92fb2 | rempt | BUG:381710 Fix xml error in kritamenu.action | Jun 27 2017 | |||
| 9c2b35f88a90 | rempt | Update the xmlgui to a high enough version number | Jun 27 2017 | |||
| 631f7b686071 | rempt | Directly use the touch config so we can reconfigure on the fly | Jun 27 2017 | |||
| 883b79021b05 | rempt | Expose the enable/disable touch config flag | Jun 27 2017 | |||
| bfc1a2f21856 | victorw | Fix two warnings pointing out an uninitialized variable and a bad if-statement… | Jun 26 2017 | |||
| 419db5b20023 | rempt | Hide this function behind private/friend: it's not public api | Jun 26 2017 | |||
| 74301cf2dd78 | rempt | Remove the deferred tool plugin functionality | Jun 26 2017 | |||
| 6d617230d1ea | rempt | forward the doubleclick event | Jun 26 2017 | |||
| a047552a63ec | rempt | build fix | Jun 26 2017 | |||
| 0a2002ff58ee | rempt | Remove the triple-click event from KoToolBase | Jun 26 2017 | |||
| 90851c2a96de | rempt | Weed out the confusing #defines in KisTool | Jun 26 2017 | |||
| 7e7615f8ec0c | rempt | Don't call KoToolBase::actions() if action(name) is meant | Jun 26 2017 | |||
| 9038b4cc7d26 | rempt | Remove KoToolBaste::updateShapeController: it is unused | Jun 26 2017 | |||
| f4bb2f8a8234 | rempt | Remove the Wheel and Touch events from KoPointerEvent | Jun 26 2017 | |||
| 89886ba247d4 | rempt | Remove WheelEvent from the KoTool system | Jun 26 2017 | |||
| a5321ecd44e0 | rempt | Remove QTouchEvent from the KoTool system | Jun 26 2017 | |||
| 2c202ce7f2a8 | rempt | Remove KisInputManager::lastTouchEvent | Jun 26 2017 | |||
| 776ee44a07ba | rempt | Remove unused code | Jun 26 2017 |