[stella] 02/03: Merge branch 'master' into jessie-backports
Stephen Kitt
skitt at moszumanska.debian.org
Sat Jun 10 08:04:03 UTC 2017
This is an automated email from the git hooks/post-receive script.
skitt pushed a commit to annotated tag debian/4.7.3-1_bpo8+1
in repository stella.
commit 73fbdbc5865e9980cfde607a1786f5e79bffac0f
Merge: 221c6ef 2d0bba6
Author: Stephen Kitt <steve at sk2.org>
Date: Tue Jun 6 08:59:33 2017 +0200
Merge branch 'master' into jessie-backports
.gitignore | 1 -
Announce.txt | 22 +-
Changes.txt | 70 +-
Makefile | 2 +-
configure | 70 +-
debian/changelog | 27 +-
debian/clean | 3 +
debian/compat | 2 +-
debian/control | 16 +-
debian/copyright | 21 +
debian/lintian-overrides | 2 +
debian/patches/evdev-joystick-flags.patch | 14 +
debian/patches/series | 3 +-
debian/patches/spelling-fix.patch | 14 -
debian/patches/spelling-fixes.patch | 64 +
debian/rules | 7 +-
debian/stella.6 | 7 +-
debian/watch | 2 +-
docs/debugger.html | 4 +-
docs/graphics/options_video_tv.png | Bin 8015 -> 8588 bytes
docs/index.html | 20 +-
src/cheat/CheatManager.hxx | 6 +-
src/common/Base.cxx | 20 +-
src/common/EventHandlerSDL2.cxx | 14 +-
src/common/EventHandlerSDL2.hxx | 8 +-
src/common/FSNodeZIP.cxx | 14 +-
src/common/FrameBufferSDL2.hxx | 8 +-
src/common/MouseControl.cxx | 10 +-
src/common/PNGLibrary.cxx | 10 +-
src/common/PNGLibrary.hxx | 4 +-
src/common/SoundNull.hxx | 4 +-
src/common/SoundSDL2.cxx | 2 +-
src/common/SoundSDL2.hxx | 4 +-
src/common/Variant.hxx | 6 +-
src/common/Version.hxx | 6 +-
src/common/ZipHandler.cxx | 18 +-
src/common/bspf.hxx | 249 +--
src/common/main.cxx | 4 +-
src/common/stella.xpm | 38 -
src/common/tv_filters/NTSCFilter.cxx | 22 +-
src/debugger/CartDebug.cxx | 60 +-
src/debugger/CartDebug.hxx | 30 +-
src/debugger/CpuDebug.cxx | 14 +-
src/debugger/Debugger.cxx | 32 +-
src/debugger/Debugger.hxx | 8 +-
src/debugger/DebuggerParser.cxx | 186 +-
src/debugger/DebuggerParser.hxx | 11 +-
src/debugger/DiStella.cxx | 26 +-
src/debugger/DiStella.hxx | 4 +-
src/debugger/PackedBitArray.hxx | 4 +-
src/debugger/TIADebug.cxx | 22 +-
src/debugger/gui/Cart0840Widget.cxx | 4 +-
.../{CartDASHWidget.cxx => Cart3EPlusWidget.cxx} | 138 +-
.../{CartDASHWidget.hxx => Cart3EPlusWidget.hxx} | 32 +-
src/debugger/gui/Cart3EWidget.cxx | 4 +-
src/debugger/gui/Cart3FWidget.cxx | 4 +-
src/debugger/gui/Cart4A50Widget.cxx | 4 +-
src/debugger/gui/CartARWidget.cxx | 4 +-
src/debugger/gui/CartBFSCWidget.cxx | 6 +-
src/debugger/gui/CartBFWidget.cxx | 6 +-
src/debugger/gui/CartCMWidget.cxx | 4 +-
src/debugger/gui/CartCTYWidget.cxx | 4 +-
src/debugger/gui/CartCVPlusWidget.cxx | 4 +-
src/debugger/gui/CartDASHWidget.cxx | 2 +-
src/debugger/gui/CartDASHWidget.hxx | 2 +-
src/debugger/gui/CartDFSCWidget.cxx | 6 +-
src/debugger/gui/CartDFWidget.cxx | 6 +-
src/debugger/gui/CartDPCPlusWidget.cxx | 4 +-
src/debugger/gui/CartDPCWidget.cxx | 4 +-
src/debugger/gui/CartE0Widget.cxx | 4 +-
src/debugger/gui/CartE7Widget.cxx | 4 +-
src/debugger/gui/CartEFSCWidget.cxx | 6 +-
src/debugger/gui/CartEFWidget.cxx | 6 +-
src/debugger/gui/CartF0Widget.cxx | 8 +-
src/debugger/gui/CartF4SCWidget.cxx | 4 +-
src/debugger/gui/CartF4Widget.cxx | 4 +-
src/debugger/gui/CartF6SCWidget.cxx | 4 +-
src/debugger/gui/CartF6Widget.cxx | 4 +-
src/debugger/gui/CartF8SCWidget.cxx | 4 +-
src/debugger/gui/CartF8Widget.cxx | 4 +-
src/debugger/gui/CartFA2Widget.cxx | 4 +-
src/debugger/gui/CartFAWidget.cxx | 4 +-
src/debugger/gui/CartFEWidget.cxx | 4 +-
src/debugger/gui/CartMCWidget.cxx | 4 +-
src/debugger/gui/CartMDMWidget.cxx | 6 +-
src/debugger/gui/CartRamWidget.cxx | 6 +-
src/debugger/gui/CartSBWidget.cxx | 12 +-
src/debugger/gui/CartUAWidget.cxx | 4 +-
src/debugger/gui/CartWDWidget.cxx | 4 +-
src/debugger/gui/CartX07Widget.cxx | 6 +-
src/debugger/gui/DataGridWidget.cxx | 6 +-
src/debugger/gui/DebuggerDialog.cxx | 11 +-
src/debugger/gui/NullControlWidget.hxx | 4 +-
src/debugger/gui/PromptWidget.cxx | 46 +-
src/debugger/gui/PromptWidget.hxx | 8 +-
src/debugger/gui/RamWidget.cxx | 4 +-
src/debugger/gui/RiotWidget.cxx | 4 +-
src/debugger/gui/RomListWidget.cxx | 6 +-
src/debugger/gui/TiaOutputWidget.cxx | 4 +-
src/debugger/gui/TiaZoomWidget.cxx | 10 +-
src/debugger/gui/module.mk | 1 +
src/emucore/Cart.cxx | 32 +-
src/emucore/Cart.hxx | 24 +-
src/emucore/Cart0840.cxx | 6 +-
src/emucore/Cart0840.hxx | 6 +-
src/emucore/Cart2K.cxx | 7 +-
src/emucore/Cart2K.hxx | 6 +-
src/emucore/Cart3E.cxx | 12 +-
src/emucore/Cart3E.hxx | 6 +-
src/emucore/{CartDASH.cxx => Cart3EPlus.cxx} | 169 +-
src/emucore/Cart3EPlus.hxx | 194 ++
src/emucore/Cart3F.cxx | 10 +-
src/emucore/Cart3F.hxx | 6 +-
src/emucore/Cart4A50.cxx | 11 +-
src/emucore/Cart4K.cxx | 6 +-
src/emucore/Cart4KSC.cxx | 14 +-
src/emucore/CartAR.cxx | 12 +-
src/emucore/CartAR.hxx | 6 +-
src/emucore/CartBF.cxx | 6 +-
src/emucore/CartBFSC.cxx | 13 +-
src/emucore/CartCM.cxx | 13 +-
src/emucore/CartCTY.cxx | 13 +-
src/emucore/CartCTYTunes.hxx | 4 +-
src/emucore/CartCV.cxx | 14 +-
src/emucore/CartCV.hxx | 6 +-
src/emucore/CartCVPlus.cxx | 12 +-
src/emucore/CartCVPlus.hxx | 6 +-
src/emucore/CartDASH.cxx | 118 +-
src/emucore/CartDASH.hxx | 254 ++-
src/emucore/CartDF.cxx | 6 +-
src/emucore/CartDFSC.cxx | 13 +-
src/emucore/CartDPC.cxx | 10 +-
src/emucore/CartDPCPlus.cxx | 7 +-
src/emucore/CartDPCPlus.hxx | 6 +-
src/emucore/CartE0.cxx | 6 +-
src/emucore/CartE7.cxx | 13 +-
src/emucore/CartEF.cxx | 6 +-
src/emucore/CartEFSC.cxx | 11 +-
src/emucore/CartF0.cxx | 6 +-
src/emucore/CartF4.cxx | 6 +-
src/emucore/CartF4SC.cxx | 13 +-
src/emucore/CartF6.cxx | 6 +-
src/emucore/CartF6SC.cxx | 13 +-
src/emucore/CartF8.cxx | 9 +-
src/emucore/CartF8SC.cxx | 13 +-
src/emucore/CartFA.cxx | 13 +-
src/emucore/CartFA2.cxx | 9 +-
src/emucore/CartFE.cxx | 6 +-
src/emucore/CartMC.cxx | 10 +-
src/emucore/CartMDM.cxx | 5 +-
src/emucore/CartMDM.hxx | 4 +-
src/emucore/CartSB.cxx | 3 -
src/emucore/CartSB.hxx | 2 +-
src/emucore/CartUA.cxx | 6 +-
src/emucore/CartWD.cxx | 13 +-
src/emucore/CartX07.cxx | 6 +-
src/emucore/Console.cxx | 18 +-
src/emucore/Console.hxx | 4 +-
src/emucore/Control.cxx | 8 +-
src/emucore/Control.hxx | 8 +-
src/emucore/DefProps.hxx | 53 +-
src/emucore/Device.hxx | 20 +-
src/emucore/Driving.cxx | 4 +-
src/emucore/EventHandler.cxx | 279 ++-
src/emucore/EventHandler.hxx | 30 +-
src/emucore/EventJoyHandler.cxx | 20 +-
src/emucore/FBSurface.cxx | 6 +-
src/emucore/FSNode.cxx | 4 +-
src/emucore/FSNode.hxx | 10 +-
src/emucore/FrameBuffer.cxx | 26 +-
src/emucore/FrameBuffer.hxx | 6 +-
src/emucore/Joystick.cxx | 5 +-
src/emucore/KidVid.hxx | 8 +-
src/emucore/M6502.cxx | 12 +-
src/emucore/M6502.hxx | 6 +-
src/emucore/M6532.cxx | 4 +-
src/emucore/MT24LC256.cxx | 12 +-
src/emucore/MT24LC256.hxx | 8 +-
src/emucore/NullDev.hxx | 11 +-
src/emucore/OSystem.cxx | 28 +-
src/emucore/OSystem.hxx | 15 +-
src/emucore/Paddles.cxx | 14 +-
src/emucore/Paddles.hxx | 4 +-
src/emucore/Props.cxx | 4 +-
src/emucore/PropsSet.cxx | 4 +-
src/emucore/PropsSet.hxx | 4 +-
src/emucore/Serializer.cxx | 5 +-
src/emucore/Settings.cxx | 10 +-
src/emucore/Sound.hxx | 4 +-
src/emucore/System.hxx | 12 +-
src/emucore/TIA.cxx | 104 +-
src/emucore/TIA.hxx | 17 +-
src/emucore/TIASnd.cxx | 2 +-
src/emucore/TIASnd.hxx | 4 +-
src/emucore/TIASurface.cxx | 8 +-
src/emucore/Thumbulator.cxx | 1993 ++++++++++----------
src/emucore/Thumbulator.hxx | 84 +-
src/emucore/module.mk | 1 +
src/emucore/stella.pro | 136 +-
src/gui/CheckListWidget.cxx | 4 +-
src/gui/ComboDialog.cxx | 6 +-
src/gui/CommandMenu.hxx | 8 +-
src/gui/ContextMenu.cxx | 14 +-
src/gui/Dialog.cxx | 8 +-
src/gui/DialogContainer.cxx | 6 +-
src/gui/DialogContainer.hxx | 8 +-
src/gui/FileListWidget.cxx | 4 +-
src/gui/GameInfoDialog.cxx | 4 +-
src/gui/GlobalPropsDialog.cxx | 6 +-
src/gui/GlobalPropsDialog.hxx | 2 +-
src/gui/InputDialog.cxx | 6 +-
src/gui/Launcher.cxx | 10 +-
src/gui/Launcher.hxx | 8 +-
src/gui/LauncherDialog.cxx | 4 +-
src/gui/LauncherFilterDialog.cxx | 6 +-
src/gui/LauncherFilterDialog.hxx | 2 +-
src/gui/ListWidget.cxx | 4 +-
src/gui/LoggerDialog.cxx | 4 +-
src/gui/Menu.hxx | 8 +-
src/gui/MessageBox.cxx | 8 +-
src/gui/Rect.hxx | 10 +-
src/gui/RomInfoWidget.cxx | 4 +-
src/gui/UIDialog.cxx | 30 +-
src/gui/VideoDialog.cxx | 56 +-
src/gui/VideoDialog.hxx | 11 +-
src/gui/Widget.cxx | 6 +-
src/macosx/Info-Stella.plist | 2 +-
src/macosx/OSystemMACOSX.hxx | 8 +-
src/macosx/SettingsMACOSX.hxx | 8 +-
src/macosx/stella.xcodeproj/project.pbxproj | 23 +-
.../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/FSNodePOSIX.cxx | 6 +-
src/unix/OSystemUNIX.hxx | 8 +-
src/unix/SettingsUNIX.hxx | 8 +-
src/unix/stella.spec | 11 +-
src/windows/FSNodeWINDOWS.cxx | 5 +-
src/windows/HomeFinder.hxx | 79 +-
src/windows/OSystemWINDOWS.hxx | 8 +-
src/windows/SDL-2.0.3_Alt-Beep.diff | 29 -
src/windows/SettingsWINDOWS.hxx | 6 +-
src/windows/Stella.vcxproj | 14 +-
src/windows/Stella.vcxproj.filters | 12 +
src/windows/stella.rc | 8 +-
src/yacc/YaccParser.cxx | 40 +-
248 files changed, 4300 insertions(+), 2938 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