diff --git a/LICENSE b/LICENSE index 59717e3a..07ae8466 100644 --- a/LICENSE +++ b/LICENSE @@ -21,7 +21,7 @@ (c) Copyright 2006 - 2007 nitsuja - (c) Copyright 2009 - 2019 BearOso, + (c) Copyright 2009 - 2022 BearOso, OV2 (c) Copyright 2017 qwertymodo @@ -139,7 +139,7 @@ (c) Copyright 2006 - 2007 Shay Green GTK+ GUI code - (c) Copyright 2004 - 2019 BearOso + (c) Copyright 2004 - 2022 BearOso Win32 GUI code (c) Copyright 2003 - 2006 blip, @@ -147,11 +147,13 @@ Matthew Kendora, Nach, nitsuja - (c) Copyright 2009 - 2019 OV2 + (c) Copyright 2009 - 2022 OV2 - Mac OS GUI code + Original Mac OS GUI code (c) Copyright 1998 - 2001 John Stiles (c) Copyright 2001 - 2011 zones + New MacOS GUI code + (c) Copyright 2022 Michael Donald Buckley Libretro port (c) Copyright 2011 - 2017 Hans-Kristian Arntzen, diff --git a/appveyor.yml b/appveyor.yml index 24ecd1b3..59c2f172 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -1,4 +1,4 @@ -version: 1.60-{build} +version: 1.61-{build} image: Visual Studio 2017 diff --git a/docs/changes.txt b/docs/changes.txt index c4bd31a4..8d4942c3 100644 --- a/docs/changes.txt +++ b/docs/changes.txt @@ -1,3 +1,5 @@ +Snes9x 1.61 + Snes9x 1.60 - Fixed subscreen blending with master brightness < 100%. - Fixed NMI timing when toggling enable bit. Fixes Chou Aniki--hack removed. diff --git a/docs/porting.html b/docs/porting.html index 86e5d12c..43090624 100644 --- a/docs/porting.html +++ b/docs/porting.html @@ -12,7 +12,7 @@

How to Port Snes9x to a New Platform

- Version: 1.60
+ Version: 1.61

Introduction

diff --git a/gtk/meson.build b/gtk/meson.build index 39df4ea2..7ce08daf 100644 --- a/gtk/meson.build +++ b/gtk/meson.build @@ -1,6 +1,6 @@ project('snes9x-gtk', ['c', 'cpp'], - version: '1.60', + version: '1.61', meson_version: '>=0.46.0', default_options: ['cpp_std=c++17']) diff --git a/gtk/po/zh_CN.po b/gtk/po/zh_CN.po index 1aaa760b..d659b4e3 100644 --- a/gtk/po/zh_CN.po +++ b/gtk/po/zh_CN.po @@ -1,6 +1,6 @@ # Chinese translations for snes9x-gtk package # snes9x-gtk 软件包的简体中文翻译. -# Copyright (C) 2019-2020 +# Copyright (C) 2019-2022 # This file is distributed under the same license as the snes9x-gtk package. # msgid "" diff --git a/macosx/Info.plist b/macosx/Info.plist index 5c345422..6e9db655 100644 --- a/macosx/Info.plist +++ b/macosx/Info.plist @@ -162,7 +162,7 @@ CFBundleExecutable Snes9x (i386) CFBundleGetInfoString - Snes9x 1.60, Copyright 1996-2019 Snes9x developers. + Snes9x 1.61, Copyright 1996-2022 Snes9x developers. CFBundleHelpBookFolder Snes9x Help CFBundleHelpBookName @@ -178,11 +178,11 @@ CFBundlePackageType APPL CFBundleShortVersionString - 1.60 + 1.61 CFBundleSignature ~9X~ CFBundleVersion - 1.60 + 1.61 CSResourcesFileMapped diff --git a/macosx/en.lproj/InfoPlist.strings b/macosx/en.lproj/InfoPlist.strings index 63230255..77326bd9 100644 --- a/macosx/en.lproj/InfoPlist.strings +++ b/macosx/en.lproj/InfoPlist.strings @@ -1,5 +1,5 @@ /* Localized versions of Info.plist keys */ CFBundleName = "Snes9x"; -CFBundleShortVersionString = "1.60"; -CFBundleGetInfoString = "Snes9x 1.60, Copyright 1996-2019 Snes9x developers."; +CFBundleShortVersionString = "1.61"; +CFBundleGetInfoString = "Snes9x 1.61, Copyright 1996-2022 Snes9x developers."; diff --git a/snes9x.h b/snes9x.h index 78064515..c3c6bac7 100644 --- a/snes9x.h +++ b/snes9x.h @@ -8,7 +8,7 @@ #define _SNES9X_H_ #ifndef VERSION -#define VERSION "1.60" +#define VERSION "1.61" #endif #include "port.h" diff --git a/unix/configure.ac b/unix/configure.ac index 66639fb5..8ad7b22c 100644 --- a/unix/configure.ac +++ b/unix/configure.ac @@ -1,6 +1,6 @@ AC_PREREQ([2.60]) -AC_INIT([Snes9x], [1.60], [], [snes9x]) -AC_REVISION([$Revision: 1.60 $]) +AC_INIT([Snes9x], [1.61], [], [snes9x]) +AC_REVISION([$Revision: 1.61 $]) AC_CONFIG_SRCDIR([unix.cpp]) diff --git a/win32/docs/readme-windows.txt b/win32/docs/readme-windows.txt index 05a816a4..f1518798 100644 --- a/win32/docs/readme-windows.txt +++ b/win32/docs/readme-windows.txt @@ -7,7 +7,7 @@ Files included in the Snes9x archive: changes.txt snes9x-license.txt -version 1.60 March, 2019 +version 1.61 February, 2022 Home page: http://www.snes9x.com/ Source code: https://github.com/snes9xgit/snes9x/ diff --git a/win32/rsrc/snes9x.rc b/win32/rsrc/snes9x.rc index d8cd3f34..eefa83e0 100644 --- a/win32/rsrc/snes9x.rc +++ b/win32/rsrc/snes9x.rc @@ -881,12 +881,12 @@ BEGIN BEGIN VALUE "CompanyName", "http://www.snes9x.com" VALUE "FileDescription", "Snes9x" - VALUE "FileVersion", "1.60" + VALUE "FileVersion", "1.61" VALUE "InternalName", "Snes9x" - VALUE "LegalCopyright", "Copyright 1996-2019" + VALUE "LegalCopyright", "Copyright 1996-2022" VALUE "OriginalFilename", "Snes9x.exe" VALUE "ProductName", "Snes9x SNES Emulator" - VALUE "ProductVersion", "1.60" + VALUE "ProductVersion", "1.61" END END BLOCK "VarFileInfo" diff --git a/win32/wlanguage.h b/win32/wlanguage.h index 8b751f61..51611112 100644 --- a/win32/wlanguage.h +++ b/win32/wlanguage.h @@ -20,7 +20,7 @@ (c) Copyright 2001 - 2006 John Weidman\r\n\ (c) Copyright 2002 - 2010 Brad Jorsch, funkyass, Kris Bleakley, Nach, zones\r\n\ (c) Copyright 2006 - 2007 nitsuja\r\n\ -(c) Copyright 2009 - 2019 BearOso, OV2\r\n\r\n\ +(c) Copyright 2009 - 2022 BearOso, OV2\r\n\r\n\ Windows Port Authors: Matthew Kendora, funkyass, nitsuja, Nach, blip, OV2.\r\n\r\n\ Snes9x is a Super Nintendo Entertainment System\r\n\ emulator that allows you to play most games designed\r\n\