diff --git a/Version b/Version index 3d9e005e6ec72bb40481a543d6e420e7e3c285ec..f5b1054abc9bd5d287b1af4973585dcb3467c12a 100644 --- a/Version +++ b/Version @@ -1,4 +1,4 @@ -; > Versions.Vicky +; > Version GET VersionASM @@ -14,13 +14,13 @@ Version SETA Module_Version VString SETS Module_MajorVersion Date SETS Module_Date ; version for STB/NC OS | -Version SETA 517 -VString SETS "5.17" +Version SETA 518 +VString SETS "5.18" [ (Version :AND: 1) = 1 Date SETS Module_Date ; Odd-numbered (i.e. development) build, use - ; date of last source checkin + ; date of last source check in | -Date SETS "19 Jan 2010" ; version for RISC OS on desktop computers +Date SETS "16 Jan 2012" ; version for RISC OS on desktop computers ; Desktop and Switcher use this via OS_Byte 0 ] ] diff --git a/VersionASM b/VersionASM index 23dfddcf84af0885e61a2b2e2ab1faeb6b29972a..8cf3daec9667f18a6893d1b15dc8ec59e111d960 100644 --- a/VersionASM +++ b/VersionASM @@ -13,11 +13,11 @@ GBLS Module_ComponentPath Module_MajorVersion SETS "5.35" Module_Version SETA 535 -Module_MinorVersion SETS "4.79.2.130" -Module_Date SETS "10 Dec 2011" -Module_ApplicationDate SETS "10-Dec-11" +Module_MinorVersion SETS "4.79.2.131" +Module_Date SETS "05 Jan 2012" +Module_ApplicationDate SETS "05-Jan-12" Module_ComponentName SETS "Kernel" Module_ComponentPath SETS "castle/RiscOS/Sources/Kernel" -Module_FullVersion SETS "5.35 (4.79.2.130)" -Module_HelpVersion SETS "5.35 (10 Dec 2011) 4.79.2.130" +Module_FullVersion SETS "5.35 (4.79.2.131)" +Module_HelpVersion SETS "5.35 (05 Jan 2012) 4.79.2.131" END diff --git a/VersionNum b/VersionNum index c01f60f98b13610161ecf7c7375672867e1a4fa0..918188cf5c9a22f94e796e14931c8136ab83b389 100644 --- a/VersionNum +++ b/VersionNum @@ -5,19 +5,19 @@ * */ #define Module_MajorVersion_CMHG 5.35 -#define Module_MinorVersion_CMHG 4.79.2.130 -#define Module_Date_CMHG 10 Dec 2011 +#define Module_MinorVersion_CMHG 4.79.2.131 +#define Module_Date_CMHG 05 Jan 2012 #define Module_MajorVersion "5.35" #define Module_Version 535 -#define Module_MinorVersion "4.79.2.130" -#define Module_Date "10 Dec 2011" +#define Module_MinorVersion "4.79.2.131" +#define Module_Date "05 Jan 2012" -#define Module_ApplicationDate "10-Dec-11" +#define Module_ApplicationDate "05-Jan-12" #define Module_ComponentName "Kernel" #define Module_ComponentPath "castle/RiscOS/Sources/Kernel" -#define Module_FullVersion "5.35 (4.79.2.130)" -#define Module_HelpVersion "5.35 (10 Dec 2011) 4.79.2.130" +#define Module_FullVersion "5.35 (4.79.2.131)" +#define Module_HelpVersion "5.35 (05 Jan 2012) 4.79.2.131" #define Module_LibraryVersionInfo "5:35" diff --git a/hdr/Options b/hdr/Options index 5b0a9befb15c6270e972cc76fb8a2e3aea0b6b88..ec2d8bf733f509430d2ede5cb352c33fcb13cc3e 100644 --- a/hdr/Options +++ b/hdr/Options @@ -115,8 +115,8 @@ Select16BitSound SETL {TRUE} GBLL Japanese16BitSound Japanese16BitSound SETL {TRUE} :LAND: STB - GBLL ChecksumCMOS -ChecksumCMOS SETL {TRUE} + GBLL ChecksumCMOS +ChecksumCMOS SETL {TRUE} GBLL SqueezeMods ; whether squeezed modules are allowed SqueezeMods SETL {TRUE} @@ -176,7 +176,7 @@ LateAborts SETL {TRUE} ShrinkableDAs SETL {TRUE} GBLL DA_Batman ; Holey dynamic areas Batman! -DA_Batman SETL {TRUE} ; concept of sparsely mapped dynamic areas introduced for Ursula +DA_Batman SETL {TRUE} ; concept of sparsely mapped dynamic areas introduced for Ursula GBLL ShadowROM ; if true, the ROM is mirrored above ShadowROM SETL {FALSE} ; &FF800000