Merge remote-tracking branch 'origin/master' into kazakov/shift-gesture-slowdown
- Conflicts:
- libs/ui/kis_action_manager.cpp
Description
Description
Details
Details
- Committed
dkazakov Sep 16 2016, 7:38 AM - Parents
- R37:f0c1171bee2d: Try changing include, for the second file...
R37:7ae543b70a1f: Forbid conversion of KisPaintOpSettingsSP into raw pointer - Branches
- Unknown
- Tags
Merged Changes
Merged Changes
| Commit | Author | Details | Committed | |||
|---|---|---|---|---|---|---|
| f0c1171bee2d | woltherav | Try changing include, for the second file... | Sep 15 2016 | |||
| a7db07470613 | woltherav | Change QtTest include, perhaps it is confusing jenkins | Sep 15 2016 | |||
| 2cf1daeb47c4 | rempt | Disable the async merger test for now | Sep 15 2016 | |||
| 504dcd42bac7 | rempt | Update | Sep 15 2016 | |||
| 0d4671991b70 | Nim | Merge branch 'master' of git://anongit.kde.org/krita | Sep 15 2016 | |||
| b11f32527a99 | Nim | Allow Level of Detail to function with OpenGL 3.0 | Sep 15 2016 | |||
| f1d01ccf3fdc | rempt | BUG:365400 Don't crash when merging layers gives an inconsistent result | Sep 15 2016 | |||
| 6d10441728ce | rempt | Simplify the sobel filter and disable Make Opaque | Sep 15 2016 | |||
| 390015d9b5d8 | rempt | BUG:368721 Make the sobel filter work if topleft != 0,0 | Sep 15 2016 | |||
| 429419275033 | rempt | BUG:368824 Do not deleted a shared pointer | Sep 15 2016 |