This is an automated email from the git hooks/post-receive script. thansen pushed a commit to branch master in repository aseprite.
commit 8028cf64db73faa194b8432473c3d39b2e95cf41 Merge: e4bb2ec 6d3c09d Author: David Capello <[email protected]> Date: Mon Apr 4 10:26:57 2016 -0300 Merge branch 'unicode-text' # Conflicts: # third_party/libpng # third_party/zlib src/app/ui/brush_popup.cpp | 6 +- src/app/ui/file_list.cpp | 2 +- src/app/ui/skin/skin_theme.cpp | 13 +- src/app/ui/tabs.cpp | 13 +- src/app/util/freetype_utils.cpp | 111 ++-------- src/doc/conversion_she.cpp | 19 +- src/ft/LICENSE.txt | 20 ++ src/ft/README.md | 4 + src/ft/face.h | 257 ++++++++++++++++++++++++ src/ft/freetype_headers.h | 15 ++ src/ft/lib.h | 54 +++++ src/she/CMakeLists.txt | 6 +- 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 +- src/she/common/freetype_font.cpp | 89 ++++++++ src/she/common/freetype_font.h | 44 ++++ src/she/common/generic_surface.h | 236 ++++++++++++++++++++++ src/she/common/locked_surface.h | 115 ----------- src/she/common/{font.h => sprite_sheet_font.h} | 28 ++- src/she/common/system.h | 13 +- src/she/display.h | 5 +- src/she/font.h | 10 +- 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 | 74 +++---- src/she/surface.h | 48 ++++- src/she/system.h | 3 +- src/ui/entry.cpp | 57 +++--- 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 | 17 +- src/ui/widget.h | 2 +- third_party/pixman-cmake/pixman-version.h.cmake | 50 ----- 43 files changed, 1032 insertions(+), 620 deletions(-) diff --cc src/she/skia/skia_surface.h index 535d8a5,5cd46d2..032074d --- a/src/she/skia/skia_surface.h +++ b/src/she/skia/skia_surface.h @@@ -8,11 -8,9 +8,10 @@@ #define SHE_SKIA_SKIA_SURFACE_INCLUDED #pragma once +#include "base/exception.h" #include "gfx/clip.h" - #include "she/common/font.h" - #include "she/locked_surface.h" - #include "she/scoped_surface_lock.h" + #include "she/common/generic_surface.h" + #include "she/common/sprite_sheet_font.h" #include "SkBitmap.h" #include "SkCanvas.h" -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/aseprite.git _______________________________________________ Pkg-games-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits
