[aseprite] 298/308: Merge branch 'upstream' to commit 2bbd918d992 to get the correct version info.

[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 a2ee019eae8a399afa5af094f7764998c3bd82ad
Merge: 1eda8e7 2bbd918
Author: Tobias Hansen <thansen at localhost.localdomain>
Date:   Tue Mar 8 00:47:13 2016 +0000

    Merge branch 'upstream' to commit 2bbd918d992 to get the correct version info.

 INSTALL.md                  | 49 +++++++++++++++++++++++++++++++++------------
 data/gui.xml                |  2 +-
 src/README.md               |  5 ++++-
 src/config.h                |  2 +-
 src/main/resources_win32.rc |  8 ++++----
 5 files changed, 46 insertions(+), 20 deletions(-)

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