From: Toni Wilen Date: Mon, 21 Dec 2015 17:18:06 +0000 (+0200) Subject: 3220 X-Git-Tag: 3220^0 X-Git-Url: https://git.unchartedbackwaters.co.uk/w/?a=commitdiff_plain;h=9938d0fef5572ee30e05cf94a46fcc90c64f86ad;p=francis%2Fwinuae.git 3220 --- diff --git a/od-win32/win32.h b/od-win32/win32.h index 20b46223..8fc11cec 100644 --- 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 42e3d864..c5bae0fa 100644 --- 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 1806e79c..fec6acd9 100644 --- a/od-win32/wix/Product.wxs +++ b/od-win32/wix/Product.wxs @@ -1,6 +1,6 @@ - +