[aseprite] 61/64: Merge branch 'upstream'

[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 a722351af466bc4b104f1bca5d2c7dfe3feca6d7
Merge: b24320c aa6040e
Author: Tobias Hansen <thansen at debian.org>
Date:   Tue Jun 21 15:15:18 2016 +0100

    Merge branch 'upstream'

 data/gui.xml                                    |   6 +-
 data/pref.xml                                   |   1 +
 data/widgets/options.xml                        |   1 +
 desktop/CMakeLists.txt                          |   8 ++
 desktop/aseprite.desktop                        |  14 +++
 src/app/CMakeLists.txt                          |   4 +
 src/app/check_update.cpp                        |  37 ++-----
 src/app/cmd/add_cel.cpp                         |   5 +-
 src/app/cmd/add_cel.h                           |   6 +-
 src/app/cmd/add_frame_tag.cpp                   |  11 +--
 src/app/cmd/add_frame_tag.h                     |   7 +-
 src/app/cmd/add_layer.cpp                       |   5 +-
 src/app/cmd/add_layer.h                         |   6 +-
 src/app/cmd/add_palette.cpp                     |   4 +-
 src/app/cmd/add_palette.h                       |   6 +-
 src/app/cmd/copy_cel.cpp                        |   6 +-
 src/app/cmd/copy_region.cpp                     |  13 ++-
 src/app/cmd/copy_region.h                       |   8 +-
 src/app/cmd/crop_cel.cpp                        |  72 ++++++++++++++
 src/app/cmd/{trim_cel.h => crop_cel.h}          |  26 +++--
 src/app/cmd/patch_cel.cpp                       |  57 +++++++++++
 src/app/cmd/patch_cel.h                         |  44 +++++++++
 src/app/cmd/trim_cel.cpp                        |  67 ++++---------
 src/app/cmd/trim_cel.h                          |  22 ++---
 src/app/commands/cmd_copy_merged.cpp            |  52 ++++++++++
 src/app/commands/cmd_move_mask.cpp              |  95 ++++++++++--------
 src/app/commands/cmd_move_mask.h                |   3 +-
 src/app/commands/cmd_new_brush.cpp              |   8 +-
 src/app/commands/cmd_options.cpp                |  10 ++
 src/app/commands/cmd_undo_history.cpp           |  11 ++-
 src/app/commands/commands_list.h                |   1 +
 src/app/document.cpp                            |   4 +-
 src/app/document_api.cpp                        |   6 +-
 src/app/res/http_loader.cpp                     |  20 ++--
 src/app/res/http_loader.h                       |  10 +-
 src/app/script/app_object.cpp                   |  35 +++++++
 src/app/script/app_scripting.cpp                |  20 ++++
 src/app/script/image_wrap.cpp                   |   6 +-
 src/app/script/selection_class.cpp              | 122 ++++++++++++++++++++++++
 src/app/script/selection_class.h                |  20 ++++
 src/app/script/sprite_class.cpp                 | 117 ++++++++++++++++++++---
 src/app/script/sprite_wrap.cpp                  |  16 +++-
 src/app/script/sprite_wrap.h                    |   1 +
 src/app/tools/inks.h                            |   3 +-
 src/app/tools/trace_policy.h                    |   4 +-
 src/app/ui/document_view.cpp                    |  12 ++-
 src/app/ui/document_view.h                      |   1 +
 src/app/ui/editor/editor.cpp                    |   1 +
 src/app/ui/editor/moving_pixels_state.cpp       |  11 ++-
 src/app/ui/editor/pivot_helpers.cpp             |   4 +-
 src/app/ui/editor/pixels_movement.cpp           |  39 ++++----
 src/app/ui/editor/state_with_wheel_behavior.cpp |  36 +++++--
 src/app/ui/editor/transform_handles.cpp         |   4 +-
 src/app/ui/news_listbox.cpp                     |  16 +++-
 src/app/ui/news_listbox.h                       |   3 +-
 src/app/ui/recent_listbox.cpp                   |   7 +-
 src/app/ui/timeline.cpp                         |  32 ++++---
 src/app/ui/timeline.h                           |   2 +-
 src/app/util/clipboard.cpp                      |  43 ++++++---
 src/app/util/clipboard.h                        |   2 +
 src/app/util/clipboard_native.cpp               |  10 +-
 src/app/util/expand_cel_canvas.cpp              |  82 +++++-----------
 src/app/util/expand_cel_canvas.h                |   5 +
 src/app/util/new_image_from_mask.cpp            |  72 ++++++++++----
 src/app/util/new_image_from_mask.h              |   6 +-
 src/app/widget_loader.cpp                       |   4 +-
 src/doc/algorithm/shrink_bounds.cpp             |  97 ++++++++++++++++++-
 src/doc/algorithm/shrink_bounds.h               |   9 +-
 src/doc/blend_funcs.cpp                         |   6 +-
 src/ft/freetype_headers.h                       |   4 +-
 src/gfx/README.md                               |   4 +-
 src/gfx/fwd.h                                   |   4 +-
 src/gfx/point.h                                 |   3 +-
 src/gfx/rect.h                                  |   9 +-
 src/gfx/size.h                                  |   1 +
 src/gfx/transformation.cpp                      |  32 +++----
 src/gfx/transformation.h                        |  56 +++++------
 src/net/http_request.cpp                        |  38 ++++----
 src/net/http_request.h                          |   7 +-
 src/script/CMakeLists.txt                       |   4 +
 src/script/engine.cpp                           |  14 ++-
 src/script/engine.h                             |   9 +-
 src/she/osx/app.mm                              |   8 +-
 src/she/osx/app_delegate.mm                     |  12 +--
 src/she/osx/generate_drop_files.h               |  27 ++++++
 src/she/osx/view.h                              |   2 +
 src/she/osx/view.mm                             |  26 ++++-
 src/she/skia/skia_display.cpp                   |   4 +-
 src/she/win/pen.cpp                             |  12 +++
 src/she/win/window_dde.cpp                      |   2 +-
 src/ui/image_view.cpp                           |  11 ++-
 src/ui/image_view.h                             |   9 +-
 src/updater/check_update.cpp                    |  42 ++++----
 src/updater/check_update.h                      |   8 +-
 94 files changed, 1355 insertions(+), 497 deletions(-)

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