3220

diff --git a/od-win32/win32.h b/od-win32/win32.h
index 20b4622308d7597f70441fc3f5dde0865bc3c221..8fc11cece91af96cbb1b6a660cf4d3e818a0634b 100644 (file)
--- a/od-win32/win32.h
+++ b/od-win32/win32.h
@@ -15,17 +15,17 @@
 #define GETBDM(x) (((x) - ((x / 10000) * 10000)) / 100)
 #define GETBDD(x) ((x) % 100)
 
-#define WINUAEPUBLICBETA 1
+#define WINUAEPUBLICBETA 0
 #define LANG_DLL 1
 #define LANG_DLL_FULL_VERSION_MATCH 0
 
 #if WINUAEPUBLICBETA
-#define WINUAEBETA _T("4")
+#define WINUAEBETA _T("")
 #else
 #define WINUAEBETA _T("")
 #endif
 
-#define WINUAEDATE MAKEBD(2015, 12, 20)
+#define WINUAEDATE MAKEBD(2015, 12, 21)
 
 //#define WINUAEEXTRA _T("AmiKit Preview")
 //#define WINUAEEXTRA _T("Amiga Forever Edition")

diff --git a/od-win32/winuaechangelog.txt b/od-win32/winuaechangelog.txt
index 42e3d8646ec83d99fd44704090ab70f27a9842a2..c5bae0faa675f7f4c321ff0574c2c901268b8104 100644 (file)
--- a/od-win32/winuaechangelog.txt
+++ b/od-win32/winuaechangelog.txt
@@ -1,4 +1,8 @@
 
+3.2.2
+
+- JIT x64 R12 special case fix.
+
 Beta 4:
 
 - Serial emulation didn't flush transmit buffer, it was possible last few characters remained in buffer.

diff --git a/od-win32/wix/Product.wxs b/od-win32/wix/Product.wxs
index 1806e79c3f4ae0debcf0a12aa005b1b4c39419b8..fec6acd9ef70b3ed58b98d1dbd691b0cf289a947 100644 (file)
--- a/od-win32/wix/Product.wxs
+++ b/od-win32/wix/Product.wxs
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi">
-  <Product Id="*" Name="WinUAE" Language="1033" Version="3.2.1.0" Manufacturer="Arabuusimiehet" UpgradeCode="88C6D045-E416-4AEA-9EE9-0B7A53EE0F16">
+  <Product Id="*" Name="WinUAE" Language="1033" Version="3.2.2.0" Manufacturer="Arabuusimiehet" UpgradeCode="88C6D045-E416-4AEA-9EE9-0B7A53EE0F16">
     <Package InstallerVersion="200" Compressed="yes" InstallScope="perMachine" />
 
     <?define SRCDIST="$(var.winuae.ProjectDir)/../../../distribution/"?>