[stella] 02/03: Merge tag 'upstream/4.6.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 cc424289247c4e505653380801bc6be6587d0615
Merge: a672f8c 8fd911f
Author: Stephen Kitt <steve at sk2.org>
Date:   Fri Apr 24 20:38:13 2015 +0200

    Merge tag 'upstream/4.6.1'
    
    Upstream version 4.6.1
    
    Conflicts:
    	debian/changelog

 Announce.txt                           |  22 +++---
 Changes.txt                            |  12 +++-
 Makefile                               |   2 +-
 configure                              |   2 +-
 docs/index.html                        |   4 +-
 src/cheat/CheatManager.cxx             |   8 +--
 src/common/Version.hxx                 |   6 +-
 src/debugger/gui/ColorWidget.cxx       |   4 +-
 src/debugger/gui/DataGridWidget.cxx    | 122 +++++++++++++++------------------
 src/debugger/gui/DataGridWidget.hxx    |  29 ++++----
 src/debugger/gui/PromptWidget.cxx      |  41 +++++------
 src/debugger/gui/PromptWidget.hxx      |   4 +-
 src/debugger/gui/RomListWidget.cxx     |  91 ++++++++++--------------
 src/debugger/gui/RomListWidget.hxx     |  10 +--
 src/debugger/gui/TiaOutputWidget.cxx   |   4 +-
 src/debugger/gui/TiaZoomWidget.cxx     |   6 +-
 src/debugger/gui/ToggleBitWidget.cxx   |   4 +-
 src/debugger/gui/TogglePixelWidget.cxx |   4 +-
 src/debugger/gui/ToggleWidget.cxx      |  10 +--
 src/gui/CheckListWidget.cxx            |  12 +---
 src/gui/Dialog.cxx                     |  28 +++-----
 src/gui/Dialog.hxx                     |  15 ++--
 src/gui/EditTextWidget.cxx             |  19 ++---
 src/gui/EditableWidget.cxx             |  21 ++----
 src/gui/EditableWidget.hxx             |  28 +++++---
 src/gui/GuiObject.hxx                  |  24 +++----
 src/gui/ListWidget.cxx                 |  18 ++---
 src/gui/RomInfoWidget.cxx              |  14 ++--
 src/gui/ScrollBarWidget.cxx            |  13 ++--
 src/gui/StringListWidget.cxx           |  12 +---
 src/gui/TabWidget.cxx                  |   4 +-
 src/gui/Widget.cxx                     |  43 +++++++-----
 src/gui/Widget.hxx                     |  15 ++--
 src/macosx/Info-Stella.plist           |   2 +-
 src/unix/stella.spec                   |   5 +-
 src/windows/stella.rc                  |   8 +--
 36 files changed, 298 insertions(+), 368 deletions(-)

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