[stella] 02/03: Merge tag 'upstream/4.6.7'

[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 b2fc739a2c24d87445d529fc644120a84f013047
Merge: 49cc529 62c6f36
Author: Stephen Kitt <steve at sk2.org>
Date:   Wed Oct 28 23:24:39 2015 +0100

    Merge tag 'upstream/4.6.7'
    
    Upstream version 4.6.7

 Announce.txt                 | 22 +++++++++++-----------
 Changes.txt                  | 12 ++++++++++--
 docs/index.html              |  2 +-
 src/common/Version.hxx       |  6 +++---
 src/emucore/CartMDM.cxx      |  6 +++---
 src/emucore/Paddles.cxx      |  6 +++---
 src/macosx/Info-Stella.plist |  2 +-
 src/unix/stella.spec         |  5 ++++-
 src/windows/stella.rc        |  8 ++++----
 9 files changed, 40 insertions(+), 29 deletions(-)

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