[aseprite] 77/128: Merge branch 'master'

[Tobias Hansen]

This is an automated email from the git hooks/post-receive script.

thansen pushed a commit to branch master
in repository aseprite.

commit 106f1c9dd99c4a4f05c397491e97de41bd1e04a2
Merge: 3a1b918 1f157a6
Author: David Capello <davidcapello at gmail.com>
Date:   Thu Apr 28 14:33:10 2016 -0300

    Merge branch 'master'

 CMakeLists.txt                         |  7 +++++++
 desktop/CMakeLists.txt                 | 16 ++++++++++++++
 desktop/aseprite-thumbnailer           | 19 +++++++++++++++++
 desktop/gnome/aseprite.thumbnailer     |  4 ++++
 desktop/kde/CMakeLists.txt             | 23 ++++++++++++++++++++
 desktop/kde/aseprite_thumb_creator.cpp | 38 ++++++++++++++++++++++++++++++++++
 desktop/kde/aseprite_thumb_creator.h   | 21 +++++++++++++++++++
 desktop/kde/asepritethumbnail.desktop  |  8 +++++++
 desktop/mime/aseprite.xml              | 12 +++++++++++
 src/she/CMakeLists.txt                 |  3 ++-
 10 files changed, 150 insertions(+), 1 deletion(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/aseprite.git