Merge branch 'master' into krita-testing-wolthera
Description
Description
Details
Details
- Committed
woltherav Sep 1 2016, 11:30 AM - Parents
- R37:f70701dced46: Merge branch 'master' into krita-testing-wolthera
R37:853e42fdd75e: Uncheck 'embed profile' by default. - Branches
- Unknown
- Tags
Merged Changes
Merged Changes
| Commit | Author | Details | Committed | |||
|---|---|---|---|---|---|---|
| 853e42fdd75e | woltherav | Uncheck 'embed profile' by default. | Sep 1 2016 | |||
| be0f07c488cd | dkazakov | Add a note about boost | Sep 1 2016 | |||
| 52c87d884e31 | dkazakov | Build KisCompositionBenchmark only on Unix | Sep 1 2016 | |||
| ba8377af06fa | dkazakov | Revert "Use pre-built gettext binaries" | Sep 1 2016 | |||
| b38aa7061d97 | dkazakov | Revert "Fix gettext" | Sep 1 2016 | |||
| 357b795352db | dkazakov | Revert "Fix typo" | Sep 1 2016 | |||
| 93de08e68a6c | dkazakov | Revert "Download the right versions" | Sep 1 2016 | |||
| e5b592c29c89 | dkazakov | Fix compilation of ext_boost on MinGW | Sep 1 2016 | |||
| 46ae6ad8996d | eingerman | Reverting all my changes, they make jenkins sad. | Sep 1 2016 | |||
| 2fef23fdb369 | eingerman | Trying to fix strange jenkins build failure | Sep 1 2016 | |||
| c3615bdda4c4 | eingerman | Triggering rebuild | Sep 1 2016 | |||
| 357d6e2c7429 | eingerman | Splitting tests to satisfy 2min limit that jenkins imposes on tests. | Sep 1 2016 | |||
| d24d56032487 | eingerman | Extending time for projection to finish. This is an attempt to fix jenkins unit… | Sep 1 2016 | |||
| 1bb582c7e422 | eingerman | Merge branch 'master' of ssh://phabricator.kde.org/diffusion/KRITA/krita | Sep 1 2016 | |||
| c69ce8c22321 | eingerman | Merge branch 'master' of ssh://phabricator.kde.org/diffusion/KRITA/krita | Aug 31 2016 | |||
| ce3883325725 | eingerman | Merge branch 'master' into eingerman/unit_test_fix | Aug 31 2016 | |||
| 3372f0010279 | eingerman | Addressing code review comments. | Aug 31 2016 | |||
| 83fa0de19073 | eingerman | No need to change alarm value. | Aug 29 2016 | |||
| 8723948277a7 | eingerman | Reducing number of iterations to reduce runtime. | Aug 29 2016 | |||
| 5fb0cbede8c5 | eingerman | Allocated as array should be deleted as array. | Aug 29 2016 | |||
| 05433c2fa631 | eingerman | Proofing conversion should fail because color is out of gamut. | Aug 29 2016 | |||
| 08255018f9c2 | eingerman | Fixed KisDerivedResourcesTest. Some messages were missing. | Aug 29 2016 | |||
| dd2628c31128 | eingerman | Reducing number of iterations to avoid test timeouts. | Aug 25 2016 | |||
| 3e355d88b123 | eingerman | Fixing incorrect reference transformed window size. | Aug 25 2016 | |||
| 00ec73347420 | eingerman | Fixing incorrect reference brush size. | Aug 25 2016 |