[mednafen] 02/06: Merge tag 'upstream/0.9.46+dfsg'

[Stephen Kitt]

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

skitt pushed a commit to branch master
in repository mednafen.

commit 47ad7a9d29ce4e7734a711033b5d5ed1a6e733cd
Merge: fa21071 91207bb
Author: Stephen Kitt <steve at sk2.org>
Date:   Sun Aug 20 16:45:36 2017 +0200

    Merge tag 'upstream/0.9.46+dfsg'
    
    Upstream version 0.9.46+dfsg

 ChangeLog                      |    35 +
 Documentation/cdplay.html      |     2 +-
 Documentation/gb.html          |     2 +-
 Documentation/gba.html         |     2 +-
 Documentation/gg.html          |     2 +-
 Documentation/lynx.html        |     2 +-
 Documentation/md.html          |     2 +-
 Documentation/mednafen.html    |     2 +-
 Documentation/modules.def      |     2 +-
 Documentation/nes.html         |     3 +-
 Documentation/nes.php          |     1 +
 Documentation/netplay.html     |     2 +-
 Documentation/ngp.html         |     2 +-
 Documentation/pce.html         |     2 +-
 Documentation/pce_fast.html    |     2 +-
 Documentation/pcfx.html        |     2 +-
 Documentation/psx.html         |     2 +-
 Documentation/settings.def     | 14260 +++++++++++++++++++++++++--------------
 Documentation/sms.html         |     2 +-
 Documentation/snes.html        |     2 +-
 Documentation/snes_faust.html  |     2 +-
 Documentation/ss.html          |    43 +-
 Documentation/ss.php           |     5 +
 Documentation/ssfplay.html     |     2 +-
 Documentation/vb.html          |     2 +-
 Documentation/wswan.html       |     2 +-
 Makefile.in                    |     1 +
 configure                      |   137 +-
 configure.ac                   |    12 +-
 po/de.gmo                      |   Bin 27350 -> 27350 bytes
 po/de.po                       |   699 +-
 po/es.gmo                      |   Bin 2760 -> 2760 bytes
 po/es.po                       |   699 +-
 po/mednafen.pot                |   701 +-
 po/ru.gmo                      |   Bin 36886 -> 36886 bytes
 po/ru.po                       |   699 +-
 src/Makefile.in                |    18 +-
 src/cdrom/CDAccess.cpp         |    40 +-
 src/cdrom/CDAccess.h           |    25 +-
 src/cdrom/CDUtility.cpp        |     2 +-
 src/cdrom/cdromif.cpp          |     4 +-
 src/demo/demo.cpp              |    41 +-
 src/desa68/Makefile.in         |     1 +
 src/drivers/Makefile.in        |     1 +
 src/drivers/debugger.cpp       |    15 +-
 src/drivers/input.cpp          |    53 +-
 src/drivers/main.cpp           |    40 +-
 src/drivers/netplay.cpp        |     3 +
 src/drivers_dos/Makefile.in    |     1 +
 src/endian.h                   |    12 +
 src/git.h                      |    20 +-
 src/mednafen.cpp               |     2 +
 src/mpcdec/Makefile.in         |     1 +
 src/nes/boards/40.cpp          |   133 +
 src/nes/boards/Makefile.am.inc |     2 +
 src/nes/ines.cpp               |     1 +
 src/nes/ines.h                 |     1 +
 src/nes/nes.cpp                |     4 +-
 src/nes/sound.cpp              |    48 +-
 src/ngp/Makefile.am            |     3 +-
 src/ngp/Makefile.in            |     7 +-
 src/pce/input/gamepad.cpp      |     6 +-
 src/pce_fast/input.cpp         |     6 +-
 src/pcfx/input/gamepad.cpp     |     6 +-
 src/quicklz/Makefile.am        |     3 +-
 src/quicklz/Makefile.in        |     5 +-
 src/settings-common.h          |    57 +-
 src/settings-driver.h          |     4 +-
 src/settings.cpp               |   187 +-
 src/settings.h                 |     5 +-
 src/sexyal/Makefile.in         |     1 +
 src/snes/Makefile.in           |     1 +
 src/ss/Makefile.in             |     1 +
 src/ss/input/3dpad.cpp         |     8 +-
 src/ss/input/mission.cpp       |    22 +-
 src/ss/sh7095.inc              |    10 +
 src/ss/smpc.cpp                |   106 +-
 src/ss/smpc.h                  |     1 +
 src/ss/ss.cpp                  |     2 +
 src/ss/vdp2_render.cpp         |    13 +-
 src/state.cpp                  |     2 +
 src/tests.cpp                  |    38 +
 src/tremor/Makefile.in         |     1 +
 src/trio/Makefile.in           |     1 +
 84 files changed, 11721 insertions(+), 6578 deletions(-)

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