[aseprite] 20/308: Merge branch 'master'

[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 e5f96a2bce9afeff82e7b653daf6e579a6e745ca
Merge: cf7c475 12ccaf8
Author: David Capello <davidcapello at gmail.com>
Date:   Tue Nov 24 19:55:18 2015 -0300

    Merge branch 'master'

 data/widgets/canvas_size.xml           | 14 +++++++-------
 data/widgets/new_sprite.xml            |  4 ++--
 src/app/commands/cmd_switch_colors.cpp |  6 +++++-
 src/app/ui/color_bar.cpp               |  4 ++++
 src/app/ui/color_spectrum.cpp          | 21 +++++++++++++++++++++
 src/app/ui/color_spectrum.h            |  4 ++++
 src/app/ui/skin/skin_theme.cpp         | 27 +++++++++++++++------------
 7 files changed, 58 insertions(+), 22 deletions(-)


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