[aseprite] 04/64: Merge branch 'scripting'

[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 d21e7770d604c685b7e51f8793da3c6e7330ff0b
Merge: 160418d 84d8a7a
Author: David Capello <davidcapello at gmail.com>
Date:   Fri May 6 16:35:49 2016 -0300

    Merge branch 'scripting'

 src/app/script/app_object.cpp   | 27 ++++++++++++++++
 src/app/script/image_wrap.cpp   |  3 ++
 src/app/script/sprite_class.cpp | 70 ++++++++++++++++++++++++++++++++++++++---
 src/app/script/sprite_wrap.cpp  | 16 +++++++---
 src/app/script/sprite_wrap.h    |  1 +
 5 files changed, 109 insertions(+), 8 deletions(-)

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