Araxis Merge File Comparison Report 2 Sat Apr 12 16:07:37 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 compare.rc c:\scm\dev\Software\Products\merge\6.0\Merge\compare Mon Mar 17 01:01:18 2003 UTC compare.rc c:\scm\dev\Software\Products\merge\6.5\Merge\compare Tue Apr 8 00:52:32 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 //MicrosoftVisualC++generatedresourcescript. //MicrosoftVisualC++generatedresourcescript. // // #include"resource.h" #include"resource.h" #defineAPSTUDIO_READONLY_SYMBOLS #defineAPSTUDIO_READONLY_SYMBOLS ///////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////// // // //GeneratedfromtheTEXTINCLUDE2resource. //GeneratedfromtheTEXTINCLUDE2resource. // // #include"afxres.h" #include"afxres.h" #ifndefAPSTUDIO_INVOKED #ifndefAPSTUDIO_INVOKED ///////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////// // // //GeneratedfromtheTEXTINCLUDE3resource. //GeneratedfromtheTEXTINCLUDE3resource. // // ///////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////// #endif//notAPSTUDIO_INVOKED #endif//notAPSTUDIO_INVOKED