[aseprite] 222/308: Merge branch 'ryb-color-wheel'

[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 ff0c2c2770764d0b93e4fe2ef5b6d63c737e7bcb
Merge: 1f319cd c1ae065
Author: David Capello <davidcapello at gmail.com>
Date:   Fri Feb 12 10:50:57 2016 -0300

    Merge branch 'ryb-color-wheel'

 data/gui.xml                                | 16 +++++-
 data/pref.xml                               |  1 +
 src/app/commands/cmd_set_color_selector.cpp | 33 ++++++++++--
 src/app/ui/color_bar.cpp                    |  9 +++-
 src/app/ui/color_bar.h                      |  5 +-
 src/app/ui/color_wheel.cpp                  | 81 ++++++++++++++++++++++++++---
 src/app/ui/color_wheel.h                    | 14 ++++-
 7 files changed, 142 insertions(+), 17 deletions(-)


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