[aseprite] 274/308: Merge branch 'tint-shade-tone-selector'

[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 873ca55c104fffd3f057f92b004142857539b15d
Merge: 875e2cd c8d59df
Author: David Capello <davidcapello at gmail.com>
Date:   Fri Feb 26 15:13:28 2016 -0300

    Merge branch 'tint-shade-tone-selector'

 data/gui.xml                                       |   6 +
 data/pref.xml                                      |   2 +-
 src/app/CMakeLists.txt                             |   1 +
 src/app/commands/cmd_set_color_selector.cpp        |   6 +
 src/app/ui/color_bar.cpp                           |  18 +++
 src/app/ui/color_bar.h                             |   3 +
 src/app/ui/color_spectrum.cpp                      |   2 +-
 ...olor_spectrum.cpp => color_tint_shade_tone.cpp} | 130 +++++++++++++--------
 src/app/ui/color_tint_shade_tone.h                 |  50 ++++++++
 src/ui/splitter.cpp                                |  10 +-
 10 files changed, 167 insertions(+), 61 deletions(-)

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