[renpy] 02/04: Merge tag 'upstream/6.99.12.2+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 bf1d0688b74b45557cb019f73dd168b814cf8f5e
Merge: 0248532 1dae96a
Author: Markus Koschany <apo at debian.org>
Date:   Wed Jan 4 22:41:17 2017 +0100

    Merge tag 'upstream/6.99.12.2+dfsg'
    
    Upstream version 6.99.12.2+dfsg
    
    # gpg: Signatur vom Mi 04 Jan 2017 22:41:17 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]

 doc/changelog.html                |    6 +-
 doc/dialogue.html                 |   17 +-
 doc/genindex.html                 |    4 +
 doc/gui.html                      |   52 +-
 doc/history.html                  |    2 +-
 doc/iap.html                      |    6 +-
 doc/keymap.html                   |    3 +
 doc/movie.html                    |    5 +-
 doc/objects.inv                   |  Bin 10760 -> 10765 bytes
 doc/py-function-class-index.html  |    5 +
 doc/reserved.html                 |    1 +
 doc/save_load_rollback.html       |    6 +-
 doc/screen_actions.html           |    6 +
 doc/screen_optimization.html      |    1 +
 doc/searchindex.js                |    2 +-
 doc/std-var-index.html            |   10 +-
 doc/style_properties.html         |    2 +-
 doc/translating_renpy.html        |   15 +-
 launcher/game/testcases.rpy       |  103 +-
 launcher/game/updater.rpy         |    2 +-
 module/gen/renpy.display.render.c | 3133 +++++++++++++++++++------------------
 renpy/__init__.py                 |    2 +-
 renpy/common/00style.rpy          |    1 -
 renpy/common/_errorhandling.rpym  |    1 -
 renpy/config.py                   |    3 +
 renpy/display/render.pyx          |    4 +
 renpy/error.py                    |    5 +-
 renpy/execution.py                |    3 +
 renpy/test/testast.py             |   32 +-
 renpy/test/testparser.py          |    9 +
 renpy/vc_version.py               |    2 +-
 31 files changed, 1855 insertions(+), 1588 deletions(-)

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