[stella] 03/06: Merge tag 'upstream/4.7.1'

[Stephen Kitt]

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

skitt pushed a commit to branch master
in repository stella.

commit aefbddffbe2ebe440a1806602b2bfcf050de82bb
Merge: f64ed32 757d1b7
Author: Stephen Kitt <steve at sk2.org>
Date:   Mon Feb 15 15:47:23 2016 +0100

    Merge tag 'upstream/4.7.1'
    
    Upstream version 4.7.1

 Announce.txt                                       |  22 +-
 Changes.txt                                        |  33 +-
 docs/graphics/options_video_tv.png                 | Bin 8015 -> 8588 bytes
 docs/index.html                                    |  19 +-
 src/common/EventHandlerSDL2.cxx                    |  12 +-
 src/common/EventHandlerSDL2.hxx                    |   8 +-
 src/common/Version.hxx                             |   6 +-
 src/emucore/CartF8.cxx                             |   5 +-
 src/emucore/DefProps.hxx                           |  53 ++-
 src/emucore/EventHandler.cxx                       | 268 +++++++-------
 src/emucore/EventHandler.hxx                       |  16 +-
 src/emucore/EventJoyHandler.cxx                    |   8 +-
 src/emucore/FrameBuffer.cxx                        |   8 +-
 src/emucore/FrameBuffer.hxx                        |   6 +-
 src/emucore/Settings.cxx                           |   8 +-
 src/emucore/TIA.cxx                                |  72 +++-
 src/emucore/TIA.hxx                                |  11 +-
 src/emucore/stella.pro                             | 136 ++++++-
 src/gui/VideoDialog.cxx                            |  52 ++-
 src/gui/VideoDialog.hxx                            |  11 +-
 src/macosx/Info-Stella.plist                       |   2 +-
 src/macosx/stella.xcodeproj/project.pbxproj        |   7 +-
 .../evdev-joystick/80-stelladaptor-joystick.rules  |   8 +
 src/tools/evdev-joystick/License.txt               | 339 ++++++++++++++++++
 src/tools/evdev-joystick/Makefile                  |  11 +
 src/tools/evdev-joystick/Readme.txt                |  83 +++++
 src/tools/evdev-joystick/evdev-joystick.c          | 390 +++++++++++++++++++++
 src/unix/stella.spec                               |   5 +-
 src/windows/SDL-2.0.3_Alt-Beep.diff                |  29 --
 src/windows/stella.rc                              |   8 +-
 30 files changed, 1345 insertions(+), 291 deletions(-)

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