1. Araxis Merge File Comparison Report

Produced by Araxis Merge on Sat Apr 12 16:07:30 2003. See www.araxis.com for information about Merge. This report uses XHTML and CSS2, and is best viewed with a reasonably standards compliant browser such as the latest version of Internet Explorer. For optimum results when printing this report, enable printing of background images and colours in your browser and use landscape orientation.

1.1 Files compared

#FileLocationLast Modified
1compare.dspc:\scm\dev\Software\Products\merge\6.0\Merge\compareMon Mar 17 01:01:16 2003 UTC
2compare.dspc:\scm\dev\Software\Products\merge\6.5\Merge\compareTue Apr 8 00:52:32 2003 UTC

1.2 Comparison summary

DescriptionBetween
Files 1 and 2
BlocksLines
Unchanged3138
Changed24
Inserted00
Removed00

1.3 Comparison options

WhitespaceAll differences in whitespace within lines are ignored
Character caseDifferences in character case are significant
Line endingsDifferences in line endings (CR and LF characters) are ignored
CR/LF charactersHidden in comparison detail

1.4 Active regular expressions

No regular expressions were active.

1.5 Comparison detail

1 # Microsoft Developer Studio Project File - Name="compare" - Package Owner=<4> 1 # Microsoft Developer Studio Project File - Name="compare" - Package Owner=<4>
2 # Microsoft Developer Studio Generated Build File, Format Version 6.00 2 # Microsoft Developer Studio Generated Build File, Format Version 6.00
3 # ** DO NOT EDIT ** 3 # ** DO NOT EDIT **
4  4 
5 # TARGTYPE "Win32 (x86) Application" 0x0101 5 # TARGTYPE "Win32 (x86) Application" 0x0101
6  6 
7 CFG=compare - Win32 Debug 7 CFG=compare - Win32 Debug
8 !MESSAGE This is not a valid makefile. To build this project using NMAKE, 8 !MESSAGE This is not a valid makefile. To build this project using NMAKE,
9 !MESSAGE use the Export Makefile command and run 9 !MESSAGE use the Export Makefile command and run
10 !MESSAGE  10 !MESSAGE 
(26 unchanged lines omitted)
37 # PROP BASE Intermediate_Dir "Release" 37 # PROP BASE Intermediate_Dir "Release"
38 # PROP BASE Target_Dir "" 38 # PROP BASE Target_Dir ""
39 # PROP Use_MFC 0 39 # PROP Use_MFC 0
40 # PROP Use_Debug_Libraries 0 40 # PROP Use_Debug_Libraries 0
41 # PROP Output_Dir "Release" 41 # PROP Output_Dir "Release"
42 # PROP Intermediate_Dir "Release" 42 # PROP Intermediate_Dir "Release"
43 # PROP Ignore_Export_Lib 0 43 # PROP Ignore_Export_Lib 0
44 # PROP Target_Dir "" 44 # PROP Target_Dir ""
45 F90=fl32.exe 45 F90=fl32.exe
46 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /Yu"stdafx.h" /FD /c 46 # ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /Yu"stdafx.h" /FD /c
47 # ADD CPP /nologo /G6 /MT /W2 /GR /GX /Ox /Ot /Og /Oi /Op /Ob2 /Gf /Gy /I "." /I "..\idl" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "WIN32" /Yu"stdafx.h" /FD /c 47 # ADD CPP /nologo /G6 /MT /W2 /GR /GX /Ox /Ot /Og /Oi /Op /Ob2 /Gf /Gy /I ". .\idl" /D "NDEBUG" /D "_WINDOWS" /D "_MBCS" /D "WIN32" /Yu"stdafx.h" /FD /c
48 # SUBTRACT CPP /Os /Fr 48 # SUBTRACT CPP /Os /Fr
49 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32 49 # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /win32
50 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32 50 # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
51 # ADD BASE RSC /l 0x809 /d "NDEBUG" 51 # ADD BASE RSC /l 0x809 /d "NDEBUG"
52 # ADD RSC /l 0x809 /d "NDEBUG" 52 # ADD RSC /l 0x809 /d "NDEBUG"
53 BSC32=bscmake.exe 53 BSC32=bscmake.exe
54 # ADD BASE BSC32 /nologo 54 # ADD BASE BSC32 /nologo
55 # ADD BSC32 /nologo 55 # ADD BSC32 /nologo
56 LINK32=link.exe 56 LINK32=link.exe
57 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386 57 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /machine:I386
(8 unchanged lines omitted)
66 # PROP BASE Intermediate_Dir "Debug" 66 # PROP BASE Intermediate_Dir "Debug"
67 # PROP BASE Target_Dir "" 67 # PROP BASE Target_Dir ""
68 # PROP Use_MFC 0 68 # PROP Use_MFC 0
69 # PROP Use_Debug_Libraries 1 69 # PROP Use_Debug_Libraries 1
70 # PROP Output_Dir "Debug" 70 # PROP Output_Dir "Debug"
71 # PROP Intermediate_Dir "Debug" 71 # PROP Intermediate_Dir "Debug"
72 # PROP Ignore_Export_Lib 0 72 # PROP Ignore_Export_Lib 0
73 # PROP Target_Dir "" 73 # PROP Target_Dir ""
74 F90=fl32.exe 74 F90=fl32.exe
75 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /Yu"stdafx.h" /FD /GZ /c 75 # ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /Yu"stdafx.h" /FD /GZ /c
76 # ADD CPP /nologo /G6 /MTd /W4 /Gi /GR /GX /Zi /Od /I "." /I "..\idl" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "WIN32" /FR /Yu"stdafx.h" /FD /GZ /c 76 # ADD CPP /nologo /G6 /MTd /W4 /Gi /GR /GX /Zi /Od /I ". .\idl" /D "_DEBUG" /D "_WINDOWS" /D "_MBCS" /D "WIN32" /FR /Yu"stdafx.h" /FD /GZ /c
77 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32 77 # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /win32
78 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32 78 # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
79 # ADD BASE RSC /l 0x809 /d "_DEBUG" 79 # ADD BASE RSC /l 0x809 /d "_DEBUG"
80 # ADD RSC /l 0x809 /d "_DEBUG" 80 # ADD RSC /l 0x809 /d "_DEBUG"
81 BSC32=bscmake.exe 81 BSC32=bscmake.exe
82 # ADD BASE BSC32 /nologo 82 # ADD BASE BSC32 /nologo
83 # ADD BSC32 /nologo 83 # ADD BSC32 /nologo
84 LINK32=link.exe 84 LINK32=link.exe
85 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept 85 # ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /debug /machine:I386 /pdbtype:sept
86 # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /version:6.0 /subsystem:windows /debug /machine:I386 /pdbtype:sept 86 # ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /version:6.0 /subsystem:windows /debug /machine:I386 /pdbtype:sept
(44 unchanged lines omitted)
131 # Begin Group "Resource Files" 131 # Begin Group "Resource Files"
132  132 
133 # PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe" 133 # PROP Default_Filter "ico;cur;bmp;dlg;rc2;rct;bin;rgs;gif;jpg;jpeg;jpe"
134 # End Group 134 # End Group
135 # Begin Source File 135 # Begin Source File
136  136 
137 SOURCE=.\ReadMe.txt 137 SOURCE=.\ReadMe.txt
138 # End Source File 138 # End Source File
139 # End Target 139 # End Target
140 # End Project 140 # End Project