[nestopia] 03/06: Merge tag 'upstream/1.47'

[Stephen Kitt]

This is an automated email from the git hooks/post-receive script.

skitt pushed a commit to branch master
in repository nestopia.

commit e9044ca6553aa3e59ee8172bec4f94e08072f36a
Merge: c5bc3eb 6f8f993
Author: Stephen Kitt <steve at sk2.org>
Date:   Tue Jan 12 19:59:45 2016 +0100

    Merge tag 'upstream/1.47'
    
    Upstream version 1.47

 .gitignore                                         |    3 +
 AUTHORS                                            |    5 +
 Makefile                                           |   40 +-
 NstDatabase.xml                                    |  123 +-
 README.md                                          |    2 +-
 README.unix                                        |   43 +-
 changelog.txt                                      |   57 +
 libretro/Makefile                                  |  403 +-
 libretro/Makefile.common                           |  296 +
 libretro/control                                   |   10 +
 libretro/jni/Android.mk                            |  123 +-
 libretro/libretro.cpp                              |  355 +-
 .../msvc/msvc-2003-xbox1/msvc-2003-xbox1.vcproj    |    3 +
 libretro/msvc/msvc-2010-360/msvc-2010-360.vcxproj  |    1 +
 .../msvc-2010-360/msvc-2010-360.vcxproj.filters    |    3 +
 libretro/msvc/msvc-2010/msvc-2010.vcxproj          |    1 +
 libretro/msvc/msvc-2010/msvc-2010.vcxproj.filters  |    3 +
 source/core/NstApu.cpp                             |    4 +-
 source/core/NstCartridge.cpp                       |    2 +-
 source/core/NstCartridgeInes.cpp                   |    7 +-
 source/core/NstCpu.cpp                             |    3 +
 source/core/NstPpu.cpp                             |   64 +-
 source/core/NstPpu.hpp                             |    2 +-
 source/core/api/NstApiCartridge.cpp                |    2 +-
 source/core/api/NstApiCartridge.hpp                |    5 +
 source/core/board/NstBoard.cpp                     |  117 +-
 source/core/board/NstBoard.hpp                     |    9 +-
 source/core/board/NstBoardAcclaim.hpp              |   35 +
 source/core/board/NstBoardAcclaimMcAcc.cpp         |  284 +
 source/core/board/NstBoardAcclaimMcAcc.hpp         |  103 +
 source/core/board/NstBoardAveNina.cpp              |   28 +-
 source/core/board/NstBoardMmc3.hpp                 |    6 +-
 source/core/board/NstBoardNamcot163.cpp            |    3 +-
 source/core/board/NstBoardNamcot163.hpp            |    3 +-
 source/core/board/NstBoardSunsoftFme7.cpp          |    4 +-
 source/unix/audio.cpp                              |   10 +-
 source/unix/cheats.cpp                             |    2 +-
 source/unix/cli.cpp                                |    2 +-
 source/unix/config.cpp                             |   26 +-
 source/unix/config.h                               |    6 +
 source/unix/cursor.cpp                             |   10 +-
 source/unix/cursor.h                               |    2 +-
 source/unix/font.h                                 |   99 +
 source/unix/gtkui/gtkui.cpp                        |  131 +-
 source/unix/gtkui/gtkui.h                          |    7 +
 source/unix/gtkui/gtkui_archive.cpp                |    2 +-
 source/unix/gtkui/gtkui_callbacks.cpp              |    7 +-
 source/unix/gtkui/gtkui_callbacks.h                |    1 +
 source/unix/gtkui/gtkui_cheats.cpp                 |    2 +-
 source/unix/gtkui/gtkui_config.cpp                 |   29 +-
 source/unix/gtkui/gtkui_dialogs.cpp                |   30 +-
 source/unix/gtkui/gtkui_dialogs.h                  |    2 +
 source/unix/input.cpp                              |  276 +-
 source/unix/input.h                                |   50 +
 source/unix/main.cpp                               |   48 +-
 source/unix/main.h                                 |    4 +-
 source/unix/png.cpp                                | 6136 ++++++++++++++++++++
 source/unix/png.h                                  | 1708 ++++++
 source/unix/video.cpp                              |  518 +-
 source/unix/video.h                                |   17 +-
 60 files changed, 10583 insertions(+), 694 deletions(-)

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