Sorry -- I forgot to include a list of the affected files:
Files 3.7-7/platforms/Cross/plugins/FilePlugin/FilePlugin.h and merge64/platforms/Cross/plugins/FilePlugin/FilePlugin.h differ Files 3.7-7/platforms/Cross/plugins/FilePlugin/sqFilePluginBasicPrims.c and merge64/platforms/Cross/plugins/FilePlugin/sqFilePluginBasicPrims.c differ Files 3.7-7/platforms/Cross/vm/sq.h and merge64/platforms/Cross/vm/sq.h differ Files 3.7-7/platforms/Cross/vm/sqNamedPrims.c and merge64/platforms/Cross/vm/sqNamedPrims.c differ Files 3.7-7/platforms/Cross/vm/sqVirtualMachine.c and merge64/platforms/Cross/vm/sqVirtualMachine.c differ Files 3.7-7/platforms/Cross/vm/sqVirtualMachine.h and merge64/platforms/Cross/vm/sqVirtualMachine.h differ
(SocketPlugin.h will likely follow, as I 64-bit clean the Unix support code this afternoon.)
Cheers, Ian