[aseprite] 25/250: Merge branch 'webp-support'

[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 6bfae49eb04025ef8421cc140e739b68c3b1e2bc
Merge: f691b91 c2a58dd
Author: David Capello <davidcapello at gmail.com>
Date:   Wed Sep 2 11:11:45 2015 -0300

    Merge branch 'webp-support'

 .gitmodules                              |   3 +
 CMakeLists.txt                           |  15 ++
 README.md                                |   1 +
 data/widgets/webp_options.xml            |  47 +++++
 src/app/CMakeLists.txt                   |   2 +
 src/app/file/file_formats_manager.cpp    |   2 +
 src/app/file/webp_format.cpp             | 352 +++++++++++++++++++++++++++++++
 src/app/file/webp_options.h              |  48 +++++
 third_party/CMakeLists.txt               |   4 +
 third_party/libwebp                      |   1 +
 third_party/libwebp-cmake/CMakeLists.txt |  45 ++++
 11 files changed, 520 insertions(+)

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