commit 9d5df13605bae1329a8e6d2140cff6b134f99e09
Author: Boudewijn Rempt <boud@valdyas.org>
Date:   Tue May 16 16:28:48 2017 +0200

    Don't abort if the tile directory has the wrong size

    This allows us to at least load the file referenced in

    BUG:379889

    which is incomaptible with xcf version v0003, but still carries
    that version number. Now it loads in krita... But no guarantees
    about 2.9 files. Mostly, they will still crash krita because
    the xcftools library aborts hard on encountering a problem, which
    we cannot prevent.

commit 0badd8a7e7ff0d5ad98446efa9cedb5da5eb101e
Author: Boudewijn Rempt <boud@valdyas.org>
Date:   Tue May 16 16:09:46 2017 +0200

    Revert "Don't try to load version 3 XCF files made with Gimp 2.9"

    This reverts commit 62327b36653bc878acda87d0597b82b1c1f1b5bb.

commit 62327b36653bc878acda87d0597b82b1c1f1b5bb
Author: Boudewijn Rempt <boud@valdyas.org>
Date:   Tue May 16 12:22:17 2017 +0200

    Don't try to load version 3 XCF files made with Gimp 2.9

    Finally Gimp 2.9's file format has changed so much that xcftools
    cannot load the tiles anymore. Until someone, somewhere updates
    xcftools to support the new file format, Krita won't load Gimp
    2.9 files.

    BUG:379889

commit 6b40888ab35df441e47d5e7a0b94ef616f4181e4
Author: l10n daemon script <scripty@kde.org>
Date:   Tue May 16 05:32:16 2017 +0200

    SVN_SILENT made messages (.desktop file) - always resolve ours

    In case of conflict in i18n, keep the version of the branch "ours"
    To resolve a particular conflict, "git checkout --ours path/to/file.desktop"

commit 9908e7668cf268b63560e27f9a5412097682bf9e
Author: l10n daemon script <scripty@kde.org>
Date:   Sun May 14 04:39:26 2017 +0200

    GIT_SILENT made messages (after extraction)

commit c0ce7240c790fecc4bcdc27ba653a1e59119bc88
Author: Kevin Funk <kfunk@kde.org>
Date:   Mon May 8 12:30:43 2017 +0200

    clang-tidy: Use override where needed

    This time for 3.1 branch


commit 6d56639afe16f2e5ac9ee0e30861bdd9b4da2b36
Author: Dmitry Kazakov <dimula73@gmail.com>
Date:   Tue May 2 21:21:24 2017 +0300

    Fix crash when starting playback with openGL disabled

    That is a critical bug in 3.1.3 :(

commit 4e41d829a363aaac2a7b555ec321d83dfe157738
Author: Dmitry Kazakov <dimula73@gmail.com>
Date:   Mon May 1 17:15:44 2017 +0300

    Fix crash when switching color-filtered layers too quickly

    Sometimes, during the removal process, the model emits currentChanged()
    signal, which may cause a double-recursion, which causes a crash.

    BUG:377732

commit 89641bfc428c268ae3fe42a0f4dd350b111ebc72
Author: Dmitry Kazakov <dimula73@gmail.com>
Date:   Mon May 1 11:17:31 2017 +0300

    Don't let the user close the document while saving is in progress

    Ideally, we should postpone closing till the saving is finished,
    but it is impossible to do right now, because doc->setModified()
    is called outside the saving lock held. Later, when we refactor
    the saving code and the modified state will be cleared under
    the lock, we can easily use KisSignalCompressor to close the
    document.

    The crash itself happened because the hack in KisPart::removeView()
    just skipped the deinitialization of the view and the input manager
    was still connected to the canvas that was destroyed.

    BUG:378538

    # Conflicts:
    #   libs/ui/KisDocument.cpp

commit 79ab516d1ad5f8f427c4a6b279184b37dda0eedd
Author: Dmitry Kazakov <dimula73@gmail.com>
Date:   Fri Apr 28 21:43:33 2017 +0300

    Don't scale down too small previews for the transform tool

    BUG:374388

commit e1fc8b8eda4f90177fd4b216d91eaef0114ffa8e
Author: Dmitry Kazakov <dimula73@gmail.com>
Date:   Fri Apr 28 20:14:13 2017 +0300

    Don't open the screen resolution settings dialog multiple times

    BUG:375773

commit 58ab108605b0a59b456e5e407fdc36567b9d4525
Author: Dmitry Kazakov <dimula73@gmail.com>
Date:   Fri Apr 28 15:54:33 2017 +0300

    Fix rendering of animation frames if the directory not exist

    Summary:
    This patch fixes four bugs:

    1) Recover warning dialog if the user tries to render animation
       frames into the directory with already existing frames. (QDir
       uses wildcard symbols instead of c-like patterns used by ffmpeg)

    2) Warn the user if rendering of frame files didn't complete
       successfully. Previously, Krita just tried to run ffmped on the
       non-existing files.

    3) Create the exporting directory if it doesn't exist.

    4) Create the rendering directory if it doesn't exist.

    NOTE: the patch doesn't introduce any new strings, so it should be
          safe for merging into 3.1

    Test Plan:
    Try rendering animation into unexisting/read-only directories. In the former
    case the new directory should be created. In the latter, error message should
    appear.

    Reviewers: #krita, rempt

    Differential Revision: https://phabricator.kde.org/D5637