Commit add82cbb authored by Neil Turton's avatar Neil Turton
Browse files

Version Spin_merge taken

parent 433a2bc1
......@@ -16,6 +16,7 @@
* Purpose: main module of a ColourDbox Object module
* Author: TGR
* History: 17-Mar-94: TGR: created
* 18-May-95: IDJ: bug-fix AQU-01270 - rmensure 310support
*
*/
......@@ -152,9 +153,20 @@ extern _kernel_oserror *ColourDbox_init(char *cmd_tail, int podule_base, void *p
if (((e = rmensure ("Toolbox", "Toolbox.Toolbox", "1.29")) != NULL)
|| ((e = rmensure ("ColourPicker", "Picker", "0.30")) != NULL)
|| ((e = rmensure ("310Support", "310Support.ThreeTen", "0.02")) != NULL))
/*|| ((e = rmensure ("310Support", "310Support.ThreeTen", "0.02")) != NULL)*/)
return e;
/* IDJ: 18-5-95: bug-fix AQU-01270: check wimp version before loading 310support */
regs.r[0] = 7; /* get Wimp version * 100 */
if ((e = _kernel_swi(Wimp_ReadSysInfo, &regs, &regs)) != NULL)
return e;
if (regs.r[0] < 350)
{
if ((e = rmensure ("310Support", "310Support.ThreeTen", "0.02")) != NULL)
return e;
}
/*
* register our messages file with ResourceFS & MessageTrans
*/
......
......@@ -27,7 +27,7 @@ service-call-handler: ColourDbox_services 0x44ec1, 0x44ec2, 0x44ec3
title-string: ColourDbox
help-string: ColourDbox 0.14
help-string: ColourDbox 0.15
command-keyword-table: ColourDbox_commands
ColourDbox_Memory()
......
......@@ -27,7 +27,7 @@ service-call-handler: ColourDbox_services 0x44ec1, 0x44ec2, 0x44ec3
title-string: ColourDbox
help-string: ColourDbox 0.14
help-string: ColourDbox 0.15
swi-chunk-base-number: 0x829c0
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment