[aseprite] 47/51: Merge branch 'upstream'
Tobias Hansen
thansen at moszumanska.debian.org
Mon Jul 11 21:35:19 UTC 2016
This is an automated email from the git hooks/post-receive script.
thansen pushed a commit to branch master
in repository aseprite.
commit 305ba0829f161c074233c6a11f7ae531b310c449
Merge: d6e1d55 92084fe
Author: Tobias Hansen <thansen at debian.org>
Date: Mon Jul 11 19:40:18 2016 +0100
Merge branch 'upstream'
.gitmodules | 3 +
.travis.yml | 4 +-
CMakeLists.txt | 6 +-
cmake/FindTests.cmake | 5 +-
data/palettes/smile-basic.gpl | 22 +
data/pref.xml | 1 +
data/widgets/import_sprite_sheet.xml | 4 +-
data/widgets/options.xml | 1 +
src/CMakeLists.txt | 14 +-
src/app/CMakeLists.txt | 1 +
src/app/app.cpp | 8 +
src/app/app_menus.h | 3 +-
src/app/commands/cmd_change_color.cpp | 28 +-
src/app/commands/cmd_close_file.cpp | 11 +-
src/app/commands/cmd_exit.cpp | 26 +-
src/app/commands/cmd_flip.cpp | 3 +-
src/app/commands/cmd_import_sprite_sheet.cpp | 23 +-
src/app/commands/cmd_keyboard_shortcuts.cpp | 54 ++-
src/app/commands/cmd_options.cpp | 3 +
src/app/commands/filters/filter_manager_impl.cpp | 174 +++-----
src/app/commands/filters/filter_manager_impl.h | 47 +-
src/app/commands/filters/filter_preview.cpp | 1 +
src/app/context.cpp | 10 +-
src/app/context.h | 3 +-
src/app/file/ase_format.cpp | 80 +++-
src/app/file/file.cpp | 3 +-
src/app/file/file_formats_manager.cpp | 2 +
src/app/file/pixly_format.cpp | 526 +++++++++++++++++++++++
src/app/ini_file.cpp | 48 ++-
src/app/resource_finder.cpp | 8 +
src/app/tools/point_shape.h | 3 +-
src/app/tools/point_shapes.h | 2 +
src/app/ui/context_bar.cpp | 21 +
src/app/ui/data_recovery_view.cpp | 2 +-
src/app/ui/data_recovery_view.h | 4 +-
src/app/ui/devconsole_view.cpp | 4 +-
src/app/ui/devconsole_view.h | 2 +-
src/app/ui/document_view.cpp | 13 +-
src/app/ui/document_view.h | 2 +-
src/app/ui/editor/brush_preview.cpp | 10 +-
src/app/ui/editor/drawing_state.cpp | 1 +
src/app/ui/editor/editor_observers.cpp | 30 +-
src/app/ui/editor/editor_observers.h | 12 +-
src/app/ui/editor/moving_pixels_state.cpp | 7 +-
src/app/ui/editor/pixels_movement.cpp | 3 +-
src/app/ui/editor/state_with_wheel_behavior.cpp | 20 +-
src/app/ui/home_view.cpp | 2 +-
src/app/ui/home_view.h | 4 +-
src/app/ui/input_chain.h | 4 +-
src/app/ui/main_window.cpp | 2 +-
src/app/ui/recent_listbox.h | 3 +-
src/app/ui/status_bar.h | 1 -
src/app/ui/tabs.cpp | 38 +-
src/app/ui/tabs.h | 3 +-
src/app/ui/timeline.cpp | 79 +++-
src/app/ui/workspace.cpp | 6 +-
src/app/ui/workspace.h | 4 +-
src/app/ui/workspace_view.h | 4 +-
src/app/util/clipboard.cpp | 3 +-
src/app/util/expand_cel_canvas.cpp | 23 +-
src/app/util/freetype_utils.cpp | 16 +-
src/base/CMakeLists.txt | 9 +-
src/base/LICENSE.txt | 2 +-
src/base/README.md | 2 +-
src/base/connection.cpp | 27 --
src/base/connection.h | 48 +--
src/base/debug.cpp | 10 +-
src/base/fs.h | 5 +-
src/base/fs_osx.mm | 29 ++
src/base/observable.h | 32 +-
src/base/observers.h | 97 -----
src/base/path.cpp | 24 ++
src/base/path.h | 3 +
src/base/signal.h | 313 +-------------
src/base/slot.h | 188 --------
src/base/thread.cpp | 15 +-
src/base/thread.h | 3 +-
src/doc/cel.h | 4 +-
src/doc/layer.h | 13 +-
src/doc/primitives.cpp | 5 +
src/doc/primitives.h | 3 +-
src/observable | 1 +
src/render/render.cpp | 349 +++++++++------
src/render/render.h | 59 +--
src/she/alleg4/she.cpp | 4 +
src/she/osx/app.h | 1 +
src/she/osx/app.mm | 13 +
src/she/osx/app_delegate.h | 2 +
src/she/osx/app_delegate.mm | 15 +
src/she/osx/view.h | 1 +
src/she/osx/view.mm | 4 +
src/she/skia/she.cpp | 16 +-
src/she/skia/skia_system.h | 6 +
src/she/system.h | 1 +
src/steam/steam.cpp | 21 +-
src/steam/steam.h | 2 +
src/ui/base.h | 3 +-
src/ui/entry.cpp | 5 +-
src/ui/manager.cpp | 15 +-
src/ui/system.cpp | 1 +
third_party/freetype2 | 2 +-
101 files changed, 1603 insertions(+), 1200 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/aseprite.git
More information about the Pkg-games-commits
mailing list