Araxis Merge File Comparison Report 7 Sat Apr 12 16:07:38 2003 1 0 1 1 ^[ \t]*$ Blank lines [ \t]*//[^"]*$ C++ comments ^[ \t]*//.*\$(Date|Archive|Author|Header|JustDate|Modtime|Revision|Workfile):.*\$.*$ SourceSafe comments ^[ \t]*//(:(Header|Source):|.*Generated.*Genitor).*\$ Genitor comments \$(Archive|Author|Date|Header|JustDate|Logfile|Modtime|Revision|Workfile):[^$]*\$ SourceSafe keywords ^[ \t]*'.*$ Visual Basic comments ^[ \t]*(//|--).*\$(Id|Revision|Date|Log):.*\$ CVS comments resource.h c:\scm\dev\Software\Products\merge\6.0\Merge\compare Mon Mar 17 01:01:18 2003 UTC resource.h c:\scm\dev\Software\Products\merge\6.5\Merge\compare Tue Apr 8 00:52:35 2003 UTC #000000 #ffffff Courier New normal normal 8pt none #ff0000 #c0dcc0 Courier New normal normal 8pt none #ff0000 #c0dcc0 Courier New normal normal 8pt none #ff0000 #a6caf0 Courier New bold normal 8pt none #000000 #ffffff Courier New normal normal 8pt none #ff0000 #c0dcc0 Courier New normal normal 8pt none #ff0000 #c0dcc0 Courier New normal normal 8pt none #ff0000 #a6caf0 Courier New bold normal 8pt none //{{NO_DEPENDENCIES}} //{{NO_DEPENDENCIES}} //MicrosoftVisualC++generatedincludefile. //MicrosoftVisualC++generatedincludefile. //Usedbycompare.rc //Usedbycompare.rc //Nextdefaultvaluesfornewobjects //Nextdefaultvaluesfornewobjects // // #ifdefAPSTUDIO_INVOKED #ifdefAPSTUDIO_INVOKED #ifndefAPSTUDIO_READONLY_SYMBOLS #ifndefAPSTUDIO_READONLY_SYMBOLS #define_APS_NEXT_RESOURCE_VALUE101 #define_APS_NEXT_RESOURCE_VALUE101 #define_APS_NEXT_COMMAND_VALUE40001 #define_APS_NEXT_COMMAND_VALUE40001 #define_APS_NEXT_CONTROL_VALUE1001 #define_APS_NEXT_CONTROL_VALUE1001 #define_APS_NEXT_SYMED_VALUE101 #define_APS_NEXT_SYMED_VALUE101 #endif #endif #endif #endif