[aseprite] 26/128: Merge branch 'cmake-optima' of https://github.com/winterheart/aseprite into cmake-optima

[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 231b17615a5eda31a4aed72387c35d31ab3644c4
Merge: 5d1b33b 18d201c
Author: David Capello <davidcapello at gmail.com>
Date:   Tue Apr 19 14:19:21 2016 -0300

    Merge branch 'cmake-optima' of https://github.com/winterheart/aseprite into cmake-optima

 .travis.yml                         |  4 ++--
 src/base/CMakeLists.txt             | 41 ++++++++-----------------------------
 third_party/modp_b64/CMakeLists.txt |  9 +++-----
 3 files changed, 14 insertions(+), 40 deletions(-)

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