[renpy] 02/03: Merge tag 'upstream/6.99.12.1+dfsg'

[Markus Koschany]

This is an automated email from the git hooks/post-receive script.

apo pushed a commit to branch master
in repository renpy.

commit b6e73059256f4de00aa4146868cb9508a1a591ed
Merge: 158f3bf f9da42d
Author: Markus Koschany <apo at debian.org>
Date:   Sun Dec 25 03:56:11 2016 +0100

    Merge tag 'upstream/6.99.12.1+dfsg'
    
    Upstream version 6.99.12.1+dfsg
    
    # gpg: Signatur vom So 25 Dez 2016 03:56:11 CET
    # gpg:                mittels RSA-Schlüssel ACF3D088EF32EDEF6A1A835FD9AD14B9513B51E4
    # gpg: Korrekte Signatur von "Markus Koschany <apo at gambaru.de>" [ultimativ]
    # gpg:                     alias "Markus Koschany <markus at koschany.net>" [ultimativ]
    # gpg:                     alias "Markus Koschany <apo at debian.org>" [ultimativ]

 launcher/game/distribute.rpy              |   3 +-
 launcher/game/tl/indonesian/common.rpy    |   4 +-
 launcher/game/tl/indonesian/developer.rpy |   4 +-
 launcher/game/tl/indonesian/launcher.rpy  |  20 +-
 launcher/game/tl/indonesian/screens.rpy   |  69 +++---
 renpy/__init__.py                         |   3 +-
 renpy/persistent.py                       |   5 +
 renpy/ui.py                               |   6 +-
 renpy/vc_version.py                       |   2 +-
 templates/indonesian/README.html          | 391 +++++++++++++++++++-----------
 templates/indonesian/game/options.rpy     |   6 +-
 templates/indonesian/game/screens.rpy     |  20 +-
 the_question/project.json                 |   2 +-
 13 files changed, 320 insertions(+), 215 deletions(-)

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