[aseprite] 130/196: Merge branch 'optional-tests'

[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 aea1e24e3211c295096b98ed81d82e167d82112c
Merge: 0605166 e10a3e4
Author: David Capello <davidcapello at gmail.com>
Date:   Tue Mar 29 19:51:44 2016 -0300

    Merge branch 'optional-tests'

 .travis.yml           |  2 +-
 CMakeLists.txt        |  1 +
 cmake/FindTests.cmake | 35 +++++++++++++++++++++++++++++++
 src/CMakeLists.txt    | 58 +++++++++++++--------------------------------------
 4 files changed, 51 insertions(+), 45 deletions(-)

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