This is an automated email from the git hooks/post-receive script. skitt pushed a commit to branch master in repository nestopia.
commit 6e652bd437f99daf283777c9d8ef14fdf7ea7b46 Merge: 39bc932 1cf5e31 Author: Stephen Kitt <st...@sk2.org> Date: Fri Sep 8 21:24:05 2017 +0200 Merge tag 'upstream/1.48' Upstream version 1.48 .gitignore | 29 + AUTHORS | 5 + CMakeLists.txt | 433 +++++++ changelog.txt => ChangeLog | 45 + Makefile | 416 ------ Makefile.am | 955 ++++++++++++++ NstDatabase.xml | 0 README.md | 50 + README.unix | 2 +- configure.ac | 129 ++ extras/BMFFINR2.pal | Bin 0 -> 192 bytes extras/BMFFINR3.pal | Bin 0 -> 192 bytes extras/NES_Classic-FBX.pal | Bin 0 -> 192 bytes extras/Nostalgia-FBX.pal | Bin 0 -> 192 bytes extras/SONY_CXA2025AS_US.pal | Bin 0 -> 192 bytes extras/Unsaturated-Final.pal | Bin 0 -> 192 bytes extras/Unsaturated-V5.pal | Bin 0 -> 192 bytes extras/Unsaturated-V6.pal | Bin 0 -> 192 bytes extras/YUV-V3.pal | Bin 0 -> 192 bytes extras/hybrid.pal | Bin 0 -> 192 bytes extras/nescap.pal | Bin 0 -> 192 bytes libretro/Makefile | 63 +- libretro/jni/Android.mk | 5 +- libretro/libretro.cpp | 375 +++++- libretro/libretro.h | 0 source/core/NstApu.cpp | 7 +- source/core/NstApu.hpp | 2 +- source/core/NstCartridge.cpp | 39 +- source/core/NstCartridgeInes.cpp | 6 + source/core/NstCore.hpp | 4 +- source/core/NstCpu.cpp | 22 +- source/core/NstCpu.hpp | 2 + source/core/NstFds.cpp | 4 +- source/core/NstImageDatabase.cpp | 6 + source/core/NstMachine.cpp | 37 +- source/core/NstMachine.hpp | 1 + source/core/NstPpu.cpp | 564 ++++++-- source/core/NstPpu.hpp | 2 + source/core/NstZlib.cpp | 2 +- source/core/api/NstApiCheats.cpp | 2 +- source/core/api/NstApiMachine.cpp | 5 + source/core/api/NstApiMachine.hpp | 8 + source/core/api/NstApiVideo.cpp | 12 +- source/core/api/NstApiVideo.hpp | 9 + source/core/board/NstBoard.cpp | 46 +- source/core/board/NstBoardAveD1012.cpp | 2 +- source/core/board/NstBoardBandai24c0x.cpp | 147 +-- source/core/board/NstBoardBandaiKaraokeStudio.cpp | 2 +- source/core/board/NstBoardBmc20in1.cpp | 2 +- source/core/board/NstBoardBmcFk23c.cpp | 2 +- source/core/board/NstBoardBmcPowerjoy84in1.cpp | 2 +- source/core/board/NstBoardBmcVt5201.cpp | 1 + source/core/board/NstBoardFfe.cpp | 58 +- source/core/board/NstBoardKonamiVrc2.cpp | 3 +- source/core/board/NstBoardMmc1.cpp | 2 +- source/core/board/NstBoardMmc5.cpp | 6 +- source/core/board/NstBoardSachenS8259.cpp | 8 +- source/core/board/NstBoardSachenStreetHeroes.cpp | 4 +- source/core/board/NstBoardSunsoftDcs.cpp | 2 +- source/core/board/NstBoardWaixingSh2.cpp | 2 +- source/core/vssystem/NstVsSystem.cpp | 5 +- source/unix/audio.cpp | 195 +-- source/unix/audio.h | 3 +- source/unix/cli.cpp | 2 +- source/unix/cli.h | 2 +- source/unix/config.cpp | 16 +- source/unix/config.h | 3 + source/unix/font.h | 4 +- source/unix/gtkui/gtkui.cpp | 26 +- source/unix/gtkui/gtkui.h | 2 +- source/unix/gtkui/gtkui_callbacks.cpp | 12 +- source/unix/gtkui/gtkui_callbacks.h | 2 + source/unix/gtkui/gtkui_cheats.cpp | 8 +- source/unix/gtkui/gtkui_config.cpp | 45 + source/unix/gtkui/gtkui_dialogs.cpp | 10 + .../icons/{nestopia128.png => 128/nestopia.png} | Bin .../unix/icons/{nestopia32.png => 32/nestopia.png} | Bin .../unix/icons/{nestopia48.png => 48/nestopia.png} | Bin .../unix/icons/{nestopia64.png => 64/nestopia.png} | Bin .../unix/icons/{nestopia96.png => 96/nestopia.png} | Bin source/unix/icons/nestopia.desktop | 2 +- source/unix/icons/{ => svg}/nespad.svg | 0 source/unix/icons/{ => svg}/nestopia.svg | 0 source/unix/input.cpp | 4 +- source/unix/input.h | 2 +- source/unix/main.cpp | 120 +- source/unix/main.h | 4 +- source/unix/video.cpp | 233 ++-- source/unix/video.h | 3 + source/zlib/ioapi.h | 75 -- source/zlib/unzip.h | 354 ----- source/zlib/zconf.h | 332 ----- source/zlib/zip.h | 235 ---- source/zlib/zlib.h | 1357 -------------------- 94 files changed, 3180 insertions(+), 3406 deletions(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/nestopia.git _______________________________________________ Pkg-games-commits mailing list Pkg-games-commits@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-games-commits