diff --git a/docs/changes.txt b/docs/changes.txt
index 5eb51e38..bb14a123 100644
--- a/docs/changes.txt
+++ b/docs/changes.txt
@@ -1,3 +1,28 @@
+Snes9x 1.60
+- Fixed subscreen blending with master brightness < 100%.
+- Fixed NMI timing when toggling enable bit. Fixes Chou Aniki--hack removed.
+- Reverted an IPL map optimization that misses a weird edge case that caused
+ The Great Battle III to lock up.
+- Clamp MSU1 addition to max amplitude instead of wrapping. Proper MSU1 tracks
+ will not be affected by this.
+
+Win32:
+- Changed window flags to allow NVIDIA cards to auto-enable exclusive
+ fullscreen mode in OpenGL.
+- Added a hidden option "DWMSync" that allows OpenGL to sync to the window
+ manager while in windowed or borderless windowed mode.
+
+libretro:
+- Added ability to use Satellaview data in same directory as ROM.
+- Fixed deviation from proper libretro spec.
+
+GTK:
+- Added icons to the entries to clear binding assignments.
+- Fixed overlap in xBRZ multithreading.
+- Changed glFenceSync option to an OML_sync option that works better.
+- Fixed accumulation of partial pixel data on mouse motion when we update the
+ mouse position more than once per frame.
+
Snes9x 1.59.2
- Fix out-of-bounds access on APU memory.
@@ -41,7 +66,7 @@ GTK+:
Snes9x 1.58
- Move the LICENSE file to the base directory and use a stub
- in all the source files referring to it.
+ in all the source files referring to it.
- Adjust Chou Aniki timing hack.
- Use 1-based numbering when displaying pressed keys.
- Hide controller port if disabled when displaying keys.
@@ -263,7 +288,7 @@ Snes9x 1.55
- Added support for the MSU-1 coprocessor. (qwertymodo)
- Added support for MSU-1 distribution pack. (qwertymodo)
- Added support for BS-X Satellaview memory packs and data (LuigiBlood)
- files.
+ files.
- Improved BS-X memory mapping accuracy. (LuigiBlood)
- Fixed APU error causing issues with some games. (byuu, qwertymodo)
- Added option to ignore patch checksums. (qwertymodo)
@@ -379,20 +404,20 @@ Snes9x 1.53
- Mac : Fixed gliches in open/save dialogs on 10.6. (zones)
- Mac : Fixed display configuration in windowed mode. (zones)
- Unix : Fixed segfault and hang-up with -DNOSOUND. (zones)
-- GTK+ : Added ability to set specific folders for SRAM,
+- GTK+ : Added ability to set specific folders for SRAM,
patches, snapshots, etc. (BearOso)
- GTK+ : Fixed many permissions issues with config folders. (BearOso)
-- GTK+ : Updated compatibility with latest GTK+ and
+- GTK+ : Updated compatibility with latest GTK+ and
GtkBuilder. Added experimental support for GTK+ 3.x. (BearOso)
-- GTK+ : Updated software output to use cairo and added the
+- GTK+ : Updated software output to use cairo and added the
ability to use bilinear-filtering with it. (BearOso)
- GTK+ : Fixed issues where cheats wouldn't stay enabled. (BearOso)
- GTK+ : Fixed focus issue when there is no window manager. (BearOso)
-- GTK+ : Fixed X Visual incompatibilities and expose
+- GTK+ : Fixed X Visual incompatibilities and expose
problems in the Xv and OpenGL outputs. (BearOso)
- GTK+ : Fixed vsync with new X Server and NVIDIA drivers. (BearOso)
- GTK+ : Added "Reduce input lag" option to OpenGL output. (BearOso)
-- GTK+ : Added a visual indication of the expected video
+- GTK+ : Added a visual indication of the expected video
refresh rate for the currently selected sound input rate. (BearOso)
Snes9x 1.52
diff --git a/docs/porting.html b/docs/porting.html
index a46cc4d8..db4537e7 100644
--- a/docs/porting.html
+++ b/docs/porting.html
@@ -12,7 +12,7 @@
How to Port Snes9x to a New Platform
- Version: 1.59.2
+ Version: 1.60
Introduction
diff --git a/gtk/meson.build b/gtk/meson.build
index bafdab36..29731141 100644
--- a/gtk/meson.build
+++ b/gtk/meson.build
@@ -1,6 +1,6 @@
project('snes9x-gtk',
['c', 'cpp'],
- version: '1.59.2',
+ version: '1.60',
default_options: ['cpp_std=c++11'])
args = ['-DSNES9X_GTK', '-DUNZIP_SUPPORT', '-DNETPLAY_SUPPORT', '-DJMA_SUPPORT', '-Wall', '-W', '-Wno-unused-parameter']
diff --git a/macosx/English.lproj/InfoPlist.strings b/macosx/English.lproj/InfoPlist.strings
index 8f5b0ed2..63230255 100644
--- a/macosx/English.lproj/InfoPlist.strings
+++ b/macosx/English.lproj/InfoPlist.strings
@@ -1,5 +1,5 @@
/* Localized versions of Info.plist keys */
CFBundleName = "Snes9x";
-CFBundleShortVersionString = "1.59.2";
-CFBundleGetInfoString = "Snes9x 1.59.2, Copyright 1996-2019 Snes9x developers.";
+CFBundleShortVersionString = "1.60";
+CFBundleGetInfoString = "Snes9x 1.60, Copyright 1996-2019 Snes9x developers.";
diff --git a/macosx/Info.plist b/macosx/Info.plist
index 7ad0a660..966f925a 100644
--- a/macosx/Info.plist
+++ b/macosx/Info.plist
@@ -162,7 +162,7 @@
CFBundleExecutable
Snes9x
CFBundleGetInfoString
- Snes9x 1.59.2, Copyright 1996-2019 Snes9x developers.
+ Snes9x 1.60, Copyright 1996-2019 Snes9x developers.
CFBundleHelpBookFolder
Snes9x Help
CFBundleHelpBookName
@@ -178,11 +178,11 @@
CFBundlePackageType
APPL
CFBundleShortVersionString
- 1.59.2
+ 1.60
CFBundleSignature
~9X~
CFBundleVersion
- 1.59.2
+ 1.60
CSResourcesFileMapped
diff --git a/macosx/Info_i386.plist b/macosx/Info_i386.plist
index 9e23d6e9..2229ece9 100644
--- a/macosx/Info_i386.plist
+++ b/macosx/Info_i386.plist
@@ -162,7 +162,7 @@
CFBundleExecutable
Snes9x (i386)
CFBundleGetInfoString
- Snes9x 1.59.2, Copyright 1996-2019 Snes9x developers.
+ Snes9x 1.60, Copyright 1996-2019 Snes9x developers.
CFBundleHelpBookFolder
Snes9x Help
CFBundleHelpBookName
@@ -178,11 +178,11 @@
CFBundlePackageType
APPL
CFBundleShortVersionString
- 1.59.2
+ 1.60
CFBundleSignature
~9X~
CFBundleVersion
- 1.59.2
+ 1.60
CSResourcesFileMapped
diff --git a/macosx/Info_ppc.plist b/macosx/Info_ppc.plist
index 3628059e..3bba90e4 100644
--- a/macosx/Info_ppc.plist
+++ b/macosx/Info_ppc.plist
@@ -162,7 +162,7 @@
CFBundleExecutable
Snes9x (ppc)
CFBundleGetInfoString
- Snes9x 1.59.2, Copyright 1996-2019 Snes9x developers.
+ Snes9x 1.60, Copyright 1996-2019 Snes9x developers.
CFBundleHelpBookFolder
Snes9x Help
CFBundleHelpBookName
@@ -178,11 +178,11 @@
CFBundlePackageType
APPL
CFBundleShortVersionString
- 1.59.2
+ 1.60
CFBundleSignature
~9X~
CFBundleVersion
- 1.59.2
+ 1.60
CSResourcesFileMapped
diff --git a/snes9x.h b/snes9x.h
index 82d3aaf3..75766f38 100644
--- a/snes9x.h
+++ b/snes9x.h
@@ -8,7 +8,7 @@
#define _SNES9X_H_
#ifndef VERSION
-#define VERSION "1.59.2"
+#define VERSION "1.60"
#endif
#include "port.h"
diff --git a/unix/configure.ac b/unix/configure.ac
index 284d1157..382a59de 100644
--- a/unix/configure.ac
+++ b/unix/configure.ac
@@ -1,6 +1,6 @@
AC_PREREQ([2.60])
-AC_INIT([Snes9x], [1.59.2], [], [snes9x])
-AC_REVISION([$Revision: 1.59.2 $])
+AC_INIT([Snes9x], [1.60], [], [snes9x])
+AC_REVISION([$Revision: 1.60 $])
AC_CONFIG_SRCDIR([unix.cpp])
diff --git a/win32/docs/readme-windows.txt b/win32/docs/readme-windows.txt
index dd6a38c1..05a816a4 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.59.2 February, 2019
+version 1.60 March, 2019
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 2ccef38a..90665a57 100644
--- a/win32/rsrc/snes9x.rc
+++ b/win32/rsrc/snes9x.rc
@@ -820,12 +820,12 @@ BEGIN
BEGIN
VALUE "CompanyName", "http://www.snes9x.com"
VALUE "FileDescription", "Snes9x"
- VALUE "FileVersion", "1.59.2"
+ VALUE "FileVersion", "1.60"
VALUE "InternalName", "Snes9x"
VALUE "LegalCopyright", "Copyright 1996-2019"
VALUE "OriginalFilename", "Snes9x.exe"
VALUE "ProductName", "Snes9x SNES Emulator"
- VALUE "ProductVersion", "1.59.2"
+ VALUE "ProductVersion", "1.60"
END
END
BLOCK "VarFileInfo"