[stella] 04/05: Merge tag 'upstream/4.6'
Stephen Kitt
skitt at moszumanska.debian.org
Sat Mar 21 22:01:39 UTC 2015
This is an automated email from the git hooks/post-receive script.
skitt pushed a commit to branch master
in repository stella.
commit a3bcc883c71296674bf68688e08661ff6ed603ff
Merge: c407fd1 abfe6d8
Author: Stephen Kitt <steve at sk2.org>
Date: Sat Mar 21 22:31:13 2015 +0100
Merge tag 'upstream/4.6'
Upstream version 4.6
Conflicts:
debian/changelog
Announce.txt | 22 +++---
Changes.txt | 39 +++++++++-
docs/index.html | 7 +-
src/cheat/Cheat.hxx | 4 +-
src/cheat/CheatCodeDialog.cxx | 17 ++++-
src/common/FrameBufferSDL2.cxx | 10 +--
src/common/FrameBufferSDL2.hxx | 12 +--
src/common/SoundSDL2.cxx | 4 +-
src/common/Version.hxx | 6 +-
src/debugger/CartDebug.cxx | 6 +-
src/debugger/gui/DataGridWidget.cxx | 4 +-
src/emucore/AtariVox.cxx | 3 +-
src/emucore/Console.cxx | 3 +-
src/emucore/DefProps.hxx | 8 +-
src/emucore/EventHandler.cxx | 22 ++++--
src/emucore/FrameBuffer.cxx | 111 ++++------------------------
src/emucore/FrameBuffer.hxx | 15 +---
src/emucore/M6502.cxx | 4 +-
src/emucore/OSystem.cxx | 3 +-
src/emucore/SerialPort.hxx | 15 ++--
src/emucore/StateManager.cxx | 17 +++--
src/emucore/stella.pro | 16 +++-
src/gui/CommandDialog.cxx | 6 +-
src/gui/Dialog.cxx | 8 +-
src/gui/DialogContainer.cxx | 4 +-
src/gui/EditableWidget.cxx | 20 +++--
src/gui/EditableWidget.hxx | 16 +++-
src/gui/InputTextDialog.cxx | 11 ++-
src/gui/InputTextDialog.hxx | 9 ++-
src/libpng/png.c | 49 ++++++++++--
src/libpng/png.h | 23 +++---
src/libpng/pngconf.h | 2 +-
src/libpng/pngrutil.c | 12 +--
src/macosx/Info-Stella.plist | 2 +-
src/macosx/stella.xcodeproj/project.pbxproj | 2 +-
src/unix/stella.spec | 5 +-
src/windows/stella.rc | 8 +-
37 files changed, 276 insertions(+), 249 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/stella.git
More information about the Pkg-games-commits
mailing list