Merged Ursula branch.

Added Machine header inclusion for new CMOS header.
Moved to srccommit.

Version 0.32. Tagged as 'Free-0_32'

VersionASM

@@ -6,9 +6,9 @@
 			GBLS	Module_MinorVersion
 			GBLS	Module_Date
 			GBLS	Module_FullVersion
-Module_MajorVersion	SETS    "0.31"
-Module_Version          SETA    31
+Module_MajorVersion	SETS    "0.32"
+Module_Version          SETA    32
 Module_MinorVersion	SETS	""
 Module_Date		SETS    "17 Aug 1999"
-Module_FullVersion      SETS    "0.31"
+Module_FullVersion      SETS    "0.32"
                         END

VersionNum

-/* (0.31)
+/* (0.32)
  *
  * This file is automatically maintained by srccommit, do not edit manually.
  *
  */
-#define Module_MajorVersion_CMHG     	0.31
+#define Module_MajorVersion_CMHG     	0.32
 #define Module_MinorVersion_CMHG	
 #define Module_Date_CMHG      		17 Aug 1999
 
-#define Module_MajorVersion     	"0.31"
-#define Module_Version                  31
+#define Module_MajorVersion     	"0.32"
+#define Module_Version                  32
 #define Module_MinorVersion		""
 #define Module_Date      		"17 Aug 1999"
 
-#define Module_FullVersion              "0.31"
+#define Module_FullVersion              "0.32"

s/Free

@@ -67,6 +67,7 @@ Module_BaseAddr
         GET     Hdr:WimpSpace
         GET     Hdr:Messages
         GET     Hdr:FilerAct
+	GET	Hdr:Machine.<Machine>
         GET     Hdr:CMOS
         GET     Hdr:MsgTrans
         GET     Hdr:MsgMenus
@@ -83,7 +84,10 @@ Module_BaseAddr
         GET     Hdr:NdrDebug
         GET     Hdr:ExtraLong
 
-        GET     Version
+        GET     VersionASM
+
+	GBLA	Version
+Version SETA	Module_Version
 
         GBLL    debugxx
         GBLL    debugmsg                ; Message lookup.

s/ModHead

@@ -37,7 +37,12 @@ MySWIBase       *       Module_SWISystemBase + FreeSWI * Module_SWIChunkSize
 
 ; ----------------------------------------------------------------------------------------------------------------------
 Title   DCB     "Free",0
-Helpstr DCB     "Free",9,9,"$VString ($Date)",0
+Helpstr DCB     "Free",9,9,"$Module_MajorVersion ($Module_Date)"
+      [ Module_MinorVersion <> ""
+        =       " $Module_MinorVersion"
+      ]
+        DCB     0
+
                 ALIGN
 Taskid  DCB     "TASK"
                 ALIGN