GitLab

Retagged as xxxxMerge-2_06.

Detail:
  c/Merge - for operation_merge, check whether there was an error before trying to look up the error number
Admin:
  Tested on BB-xM with high processor vectors


Version 2.06. Tagged as 'xxxxMerge-2_06'

Version 2.05. Tagged as 'xxxxMerge-2_05'

Version 2.04. Tagged as 'xxxxMerge-2_04'

Detail:
  Some changes were required in order for this component to build and install
  correctly. These changes are required for the ROOL 'Disc' build.
Admin:
  Tested in Iyonix 'Disc' build using ROOL 'BuildEnv' build environment

Version 2.03. Tagged as 'xxxxMerge-2_03'

Makefile tweaks
As featured on disc image accompanying RISC OS 5.00

Version 2.02. Tagged as 'xxxxMerge-2_02'

Bugfix: if the user clicked Agenda then Merge, the log directory wasn't being unset after the operation was complete. (Simple Merge operations were not affected.)

SysMerge version number increased to 2.00 to avoid clashes with old SysMerge applications. BootMerge and FontMerge versions also increased, to keep them in line with SysMerge.

Fixed event ordering problems that became apparent when click-type window tools were re-enabled in the Wimp. This involves a subtle alteration to the plug-in quit protocol.

Initial import of Configure plug-ins '!BootMerge', '!FontMerge' and '!SysMerge' to CVS, this time in the correct place.

Note that !BootMerge and !FontMerge plug in to !BootSetup and !FontSetup
respectively, and all three plug-ins share the same source code.