[aseprite] 101/308: Merge branch 'user-data'

[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 8698ac5f573c0836383739ee717dc876fb50fdbb
Merge: a09df52 8683763
Author: David Capello <davidcapello at gmail.com>
Date:   Fri Dec 11 19:49:56 2015 -0300

    Merge branch 'user-data'

 data/skins/default/sheet.png              | Bin 14034 -> 14067 bytes
 data/skins/default/skin.xml               |   1 +
 data/widgets/cel_properties.xml           |   3 +-
 data/widgets/layer_properties.xml         |   7 +-
 docs/files/ase.txt                        |  22 +++-
 src/app/CMakeLists.txt                    |   2 +
 src/app/cmd/set_user_data.cpp             |  37 +++++++
 src/app/cmd/set_user_data.h               |  45 ++++++++
 src/app/commands/cmd_cel_properties.cpp   |  31 +++++-
 src/app/commands/cmd_layer_properties.cpp |  23 +++-
 src/app/document.cpp                      |   3 +-
 src/app/file/ase_format.cpp               |  93 +++++++++++++---
 src/app/ui/document_view.cpp              |  10 ++
 src/app/ui/document_view.h                |   2 +
 src/app/ui/skin/skin_theme.cpp            |  12 ++-
 src/app/ui/status_bar.cpp                 |   2 +-
 src/app/ui/timeline.cpp                   |  30 +++++-
 src/app/ui/toolbar.cpp                    |  17 ++-
 src/app/ui/user_data_popup.cpp            |  76 +++++++++++++
 src/app/ui/user_data_popup.h              |  25 +++++
 src/app/util/create_cel_copy.cpp          |   1 +
 src/app/util/expand_cel_canvas.cpp        |   5 -
 src/app/widget_loader.cpp                 |  18 +++-
 src/doc/CMakeLists.txt                    |   3 +-
 src/doc/cel_data.cpp                      |   4 +-
 src/doc/cel_data.h                        |   3 +-
 src/doc/cel_data_io.cpp                   |   5 +
 src/doc/layer.cpp                         |   2 +-
 src/doc/layer.h                           |   3 +-
 src/doc/layer_io.cpp                      |   7 +-
 src/doc/user_data.h                       |  49 +++++++++
 src/doc/user_data_io.cpp                  |  38 +++++++
 src/doc/user_data_io.h                    |  22 ++++
 src/doc/with_user_data.h                  |  33 ++++++
 src/gen/ui_class.cpp                      |   2 +
 src/ui/popup_window.cpp                   |  10 ++
 src/ui/popup_window.h                     |   6 +-
 src/ui/textbox.h                          |   3 +-
 src/ui/tooltips.cpp                       | 171 +++++++++++++++---------------
 src/ui/tooltips.h                         |  14 +--
 40 files changed, 683 insertions(+), 157 deletions(-)

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