[aseprite] 49/196: Merge branch 'remove-locked-surface' into freetype-font

[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 64111bf991e58e69f3cb84794e3cae30f53ad9a0
Merge: 0f60ca2 0abe01c
Author: David Capello <davidcapello at gmail.com>
Date:   Wed Mar 9 12:31:42 2016 -0300

    Merge branch 'remove-locked-surface' into freetype-font
    
    # Conflicts:
    #	src/she/common/generic_surface.h

 src/app/ui/brush_popup.cpp                         |  6 +-
 src/app/ui/skin/skin_theme.cpp                     |  7 +--
 src/app/ui/tabs.cpp                                | 15 +++--
 src/doc/conversion_she.cpp                         | 19 +++---
 src/she/alleg4/alleg_display.cpp                   |  4 +-
 src/she/alleg4/alleg_display.h                     |  4 +-
 src/she/alleg4/alleg_surface.cpp                   | 43 ++++++--------
 src/she/alleg4/alleg_surface.h                     | 22 +++----
 .../common/{locked_surface.h => generic_surface.h} | 18 +++---
 src/she/common/sprite_sheet_font.h                 |  8 +--
 src/she/display.h                                  |  5 +-
 src/she/locked_surface.h                           | 58 -------------------
 src/she/scoped_surface_lock.h                      | 29 ----------
 src/she/she.h                                      |  4 +-
 src/she/skia/skia_display.cpp                      |  6 +-
 src/she/skia/skia_display.h                        |  4 +-
 src/she/skia/skia_surface.h                        | 57 +++++++++---------
 src/she/surface.h                                  | 48 ++++++++++++++--
 src/ui/graphics.cpp                                | 67 +++++++++++-----------
 src/ui/manager.cpp                                 | 17 +++---
 src/ui/move_region.cpp                             | 26 ++++-----
 src/ui/overlay.cpp                                 | 25 ++++----
 src/ui/overlay.h                                   |  9 ++-
 src/ui/overlay_manager.cpp                         | 16 +++---
 src/ui/view.cpp                                    |  7 ++-
 src/ui/widget.cpp                                  | 11 ++--
 26 files changed, 229 insertions(+), 306 deletions(-)

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