[stella] 02/05: Merge tag 'upstream/4.6.6'

[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 dab49d14edba17d2105044f38366a1748580f2e5
Merge: 84f132b dc9f9e8
Author: Stephen Kitt <steve at sk2.org>
Date:   Mon Oct 12 18:20:04 2015 +0200

    Merge tag 'upstream/4.6.6'
    
    Upstream version 4.6.6

 Announce.txt                 | 22 +++++++++++-----------
 Changes.txt                  | 14 ++++++++++++--
 docs/index.html              | 10 ++++++++--
 src/common/Version.hxx       |  6 +++---
 src/emucore/CartMDM.cxx      | 10 +++++-----
 src/emucore/Console.cxx      | 10 +++++++++-
 src/emucore/Console.hxx      |  9 +++++++--
 src/emucore/EventHandler.cxx |  6 +++++-
 src/emucore/Settings.cxx     |  3 ++-
 src/emucore/TIA.cxx          | 24 ++++++++++++++++++++----
 src/emucore/TIA.hxx          | 17 +++++++++++++++--
 src/macosx/Info-Stella.plist |  2 +-
 src/unix/stella.spec         |  5 ++++-
 src/windows/stella.rc        |  8 ++++----
 14 files changed, 106 insertions(+), 40 deletions(-)

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