[aseprite] 124/308: Merge branch 'new-brush-popup'

[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 51e3ab178de51a58dcfdb7a7aba0430b0266d841
Merge: 3b9ba0d 403e3ee
Author: David Capello <davidcapello at gmail.com>
Date:   Wed Dec 16 18:45:24 2015 -0300

    Merge branch 'new-brush-popup'

 data/pref.xml                               |  11 +
 data/widgets/brush_slot_params.xml          |  34 +++
 src/app/CMakeLists.txt                      |   1 +
 src/app/app.h                               |   3 +
 src/app/app_brushes.cpp                     | 118 ++++++++
 src/app/app_brushes.h                       |  52 ++++
 src/app/brush_slot.h                        | 107 ++++++++
 src/app/commands/cmd_keyboard_shortcuts.cpp |  24 +-
 src/app/commands/cmd_new_brush.cpp          |   4 +-
 src/app/ui/brush_popup.cpp                  | 408 +++++++++++++++++++++-------
 src/app/ui/brush_popup.h                    |  30 +-
 src/app/ui/button_set.cpp                   |  61 ++++-
 src/app/ui/button_set.h                     |   5 +-
 src/app/ui/context_bar.cpp                  | 204 ++++++++------
 src/app/ui/context_bar.h                    |  32 +--
 src/app/widget_loader.cpp                   |   6 +
 src/gen/ui_class.cpp                        |   5 +
 src/ui/widget.cpp                           |   4 +-
 src/ui/widget.h                             |   5 +-
 19 files changed, 866 insertions(+), 248 deletions(-)

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