This is an automated email from the git hooks/post-receive script. thansen pushed a commit to branch master in repository aseprite.
commit 56e663bca437c39e463e21d3bbcc0493bcfbf783 Merge: c5f7e96 9b05d2e Author: David Capello <[email protected]> Date: Thu Apr 21 13:22:23 2016 -0300 Merge branch 'eraser-support' src/CMakeLists.txt | 1 - src/app/CMakeLists.txt | 1 - src/app/app.cpp | 4 -- src/app/ui/document_view.cpp | 1 + src/app/ui/editor/editor.cpp | 17 +++++++ src/app/ui/editor/editor.h | 2 + src/app/ui/toolbar.cpp | 4 +- src/pen/pen_win.h | 2 +- src/she/CMakeLists.txt | 1 + src/she/common/system.h | 1 + src/she/event.h | 17 ++++++- src/she/osx/view.h | 5 +- src/she/osx/view.mm | 34 ++++++++++++- src/she/pointer_type.h | 25 ++++++++++ src/she/skia/she.cpp | 2 - src/she/skia/skia_system.h | 7 ++- src/she/win/pen.cpp | 111 +++++++++++++++++++++++++++++++++++++++++++ src/she/win/pen.h | 41 ++++++++++++++++ src/she/win/system.h | 31 ++++++++++++ src/she/win/window.h | 100 +++++++++++++++++++++++++++++++++++++- src/ui/combobox.cpp | 3 +- src/ui/int_entry.cpp | 3 +- src/ui/manager.cpp | 97 ++++++++++++++++++++++++++----------- src/ui/manager.h | 37 +++++++++++---- src/ui/message.h | 5 ++ src/ui/pointer_type.h | 19 ++++++++ src/ui/ui.h | 5 +- src/ui/widget.cpp | 2 + 28 files changed, 522 insertions(+), 56 deletions(-) -- 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

