3. 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.

3.1 Files compared

#FileLocationLast Modified
1Sat Apr 12 15:07:30 2003 UTC
2compare.vcprojc:\scm\dev\Software\Products\merge\6.5\Merge\compareSat Apr 12 00:59:47 2003 UTC

3.2 Comparison summary

DescriptionBetween
Files 1 and 2
BlocksLines
Unchanged00
Changed00
Inserted1232
Removed00

3.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

3.4 Active regular expressions

No regular expressions were active.

3.5 Comparison detail

  1 <?xml version="1.0" encoding="Windows-1252"?>
  2 <VisualStudioProject
  3  ProjectType="Visual C++"
  4  Version="7.10"
  5  Name="compare"
  6  ProjectGUID="{350F82DB-8A3F-40A6-8615-0EFE998A58EA}"
  7  SccProjectName=""
  8  SccAuxPath=""
  9  SccLocalPath=""
  10  SccProvider="">
  11  <Platforms>
  12  <Platform
  13  Name="Win32"/>
  14  </Platforms>
  15  <Configurations>
  16  <Configuration
  17  Name="Debug|Win32"
  18  OutputDirectory=".\Debug"
  19  IntermediateDirectory=".\Debug"
  20  ConfigurationType="1"
  21  UseOfMFC="0"
  22  UseOfATL="1"
  23  ATLMinimizesCRunTimeLibraryUsage="FALSE"
  24  CharacterSet="1"
  25  WholeProgramOptimization="FALSE">
  26  <Tool
  27  Name="VCCLCompilerTool"
  28  Optimization="0"
  29  OptimizeForProcessor="0"
  30  OptimizeForWindowsApplication="FALSE"
  31  AdditionalIncludeDirectories="..\idl"
  32  PreprocessorDefinitions="_DEBUG,_WINDOWS,WIN32,UNICODE"
  33  StringPooling="TRUE"
  34  MinimalRebuild="FALSE"
  35  BasicRuntimeChecks="3"
  36  RuntimeLibrary="1"
  37  BufferSecurityCheck="TRUE"
  38  EnableFunctionLevelLinking="FALSE"
  39  ForceConformanceInForLoopScope="TRUE"
  40  RuntimeTypeInfo="TRUE"
  41  UsePrecompiledHeader="3"
  42  PrecompiledHeaderThrough="stdafx.h"
  43  PrecompiledHeaderFile=".\Debug/compare.pch"
  44  AssemblerListingLocation=".\Debug/"
  45  ObjectFile=".\Debug/"
  46  ProgramDataBaseFileName=".\Debug/"
  47  BrowseInformation="0"
  48  WarningLevel="4"
  49  SuppressStartupBanner="TRUE"
  50  Detect64BitPortabilityProblems="FALSE"
  51  DebugInformationFormat="3"/>
  52  <Tool
  53  Name="VCCustomBuildTool"/>
  54  <Tool
  55  Name="VCLinkerTool"
  56  AdditionalDependencies="unicows.lib version.lib mpr.lib rasapi32.lib winmm.lib vfw32.lib secur32.lib oleacc.lib oledlg.lib sensapi.lib imm32.lib htmlhelp.lib wininet.lib"
  57  OutputFile=".\Debug/compare.exe"
  58  Version="6.5"
  59  LinkIncremental="1"
  60  SuppressStartupBanner="TRUE"
  61  IgnoreDefaultLibraryNames="kernel32.lib,advapi32.lib,user32.lib,gdi32.lib,shell32.lib,comdlg32.lib,version.lib,mpr.lib,rasapi32.lib,winmm.lib,winspool.lib,vfw32.lib,secur32.lib,oleacc.lib,oledlg.lib,sensapi.lib"
  62  GenerateDebugInformation="TRUE"
  63  ProgramDatabaseFile=".\Debug/compare.pdb"
  64  SubSystem="2"/>
  65  <Tool
  66  Name="VCMIDLTool"
  67  PreprocessorDefinitions="_DEBUG"
  68  MkTypLibCompatible="TRUE"
  69  SuppressStartupBanner="TRUE"
  70  TargetEnvironment="1"
  71  TypeLibraryName=".\Debug/compare.tlb"/>
  72  <Tool
  73  Name="VCPostBuildEventTool"/>
  74  <Tool
  75  Name="VCPreBuildEventTool"/>
  76  <Tool
  77  Name="VCPreLinkEventTool"/>
  78  <Tool
  79  Name="VCResourceCompilerTool"
  80  PreprocessorDefinitions="_DEBUG"
  81  Culture="2057"/>
  82  <Tool
  83  Name="VCWebServiceProxyGeneratorTool"/>
  84  <Tool
  85  Name="VCXMLDataGeneratorTool"/>
  86  <Tool
  87  Name="VCWebDeploymentTool"/>
  88  <Tool
  89  Name="VCManagedWrapperGeneratorTool"/>
  90  <Tool
  91  Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
  92  </Configuration>
  93  <Configuration
  94  Name="Release|Win32"
  95  OutputDirectory=".\Release"
  96  IntermediateDirectory=".\Release"
  97  ConfigurationType="1"
  98  UseOfMFC="0"
  99  UseOfATL="1"
  100  ATLMinimizesCRunTimeLibraryUsage="FALSE"
  101  CharacterSet="1"
  102  WholeProgramOptimization="TRUE">
  103  <Tool
  104  Name="VCCLCompilerTool"
  105  Optimization="0"
  106  GlobalOptimizations="FALSE"
  107  InlineFunctionExpansion="0"
  108  EnableIntrinsicFunctions="FALSE"
  109  ImproveFloatingPointConsistency="TRUE"
  110  FavorSizeOrSpeed="0"
  111  OmitFramePointers="FALSE"
  112  OptimizeForProcessor="2"
  113  OptimizeForWindowsApplication="TRUE"
  114  AdditionalIncludeDirectories="..\idl"
  115  PreprocessorDefinitions="NDEBUG,_WINDOWS,WIN32,UNICODE"
  116  StringPooling="TRUE"
  117  ExceptionHandling="TRUE"
  118  RuntimeLibrary="0"
  119  BufferSecurityCheck="TRUE"
  120  EnableFunctionLevelLinking="TRUE"
  121  ForceConformanceInForLoopScope="TRUE"
  122  RuntimeTypeInfo="TRUE"
  123  UsePrecompiledHeader="3"
  124  PrecompiledHeaderThrough="stdafx.h"
  125  PrecompiledHeaderFile=".\Release/compare.pch"
  126  AssemblerOutput="0"
  127  AssemblerListingLocation=".\Release/"
  128  ObjectFile=".\Release/"
  129  ProgramDataBaseFileName=".\Release/"
  130  WarningLevel="4"
  131  SuppressStartupBanner="TRUE"
  132  Detect64BitPortabilityProblems="FALSE"
  133  DebugInformationFormat="3"/>
  134  <Tool
  135  Name="VCCustomBuildTool"/>
  136  <Tool
  137  Name="VCLinkerTool"
  138  AdditionalDependencies="unicows.lib kernel32.lib advapi32.lib user32.lib gdi32.lib shell32.lib comdlg32.lib version.lib mpr.lib rasapi32.lib winmm.lib winspool.lib vfw32.lib secur32.lib oleacc.lib oledlg.lib sensapi.lib imm32.lib ws2_32.lib htmlhelp.lib"
  139  OutputFile=".\Release/compare.exe"
  140  Version="6.5"
  141  LinkIncremental="1"
  142  SuppressStartupBanner="TRUE"
  143  IgnoreDefaultLibraryNames="kernel32.lib;advapi32.lib;user32.lib;gdi32.lib;shell32.lib;comdlg32.lib;version.lib;mpr.lib;rasapi32.lib;winmm.lib;winspool.lib;vfw32.lib;secur32.lib;oleacc.lib;oledlg.lib;sensapi.lib"
  144  DelayLoadDLLs="ws2_32.dll,oleacc.dll"
  145  GenerateDebugInformation="TRUE"
  146  GenerateMapFile="TRUE"
  147  MapFileName=".\Release/compare.map"
  148  SubSystem="2"
  149  OptimizeReferences="1"
  150  EnableCOMDATFolding="1"
  151  OptimizeForWindows98="0"
  152  SetChecksum="TRUE"
  153  TargetMachine="1"/>
  154  <Tool
  155  Name="VCMIDLTool"
  156  PreprocessorDefinitions="NDEBUG"
  157  MkTypLibCompatible="TRUE"
  158  SuppressStartupBanner="TRUE"
  159  TargetEnvironment="1"
  160  TypeLibraryName=".\Release/compare.tlb"/>
  161  <Tool
  162  Name="VCPostBuildEventTool"/>
  163  <Tool
  164  Name="VCPreBuildEventTool"/>
  165  <Tool
  166  Name="VCPreLinkEventTool"/>
  167  <Tool
  168  Name="VCResourceCompilerTool"
  169  PreprocessorDefinitions="NDEBUG"
  170  Culture="2057"/>
  171  <Tool
  172  Name="VCWebServiceProxyGeneratorTool"/>
  173  <Tool
  174  Name="VCXMLDataGeneratorTool"/>
  175  <Tool
  176  Name="VCWebDeploymentTool"/>
  177  <Tool
  178  Name="VCManagedWrapperGeneratorTool"/>
  179  <Tool
  180  Name="VCAuxiliaryManagedWrapperGeneratorTool"/>
  181  </Configuration>
  182  </Configurations>
  183  <References>
  184  </References>
  185  <Files>
  186  <Filter
  187  Name="Source Files"
  188  Filter="cpp;c;cxx;rc;def;r;odl;idl;hpj;bat">
  189  <File
  190  RelativePath=".\compare.cpp">
  191  </File>
  192  <File
  193  RelativePath="compare.rc">
  194  </File>
  195  <File
  196  RelativePath="compareutil.cpp">
  197  </File>
  198  <File
  199  RelativePath=".\StdAfx.cpp">
  200  <FileConfiguration
  201  Name="Debug|Win32">
  202  <Tool
  203  Name="VCCLCompilerTool"
  204  UsePrecompiledHeader="1"
  205  PrecompiledHeaderFile="$(IntDir)/$(TargetName).pch"/>
  206  </FileConfiguration>
  207  <FileConfiguration
  208  Name="Release|Win32">
  209  <Tool
  210  Name="VCCLCompilerTool"
  211  UsePrecompiledHeader="1"
  212  PrecompiledHeaderFile="$(IntDir)/$(TargetName).pch"/>
  213  </FileConfiguration>
  214  </File>
  215  </Filter>
  216  <Filter
  217  Name="Header Files"
  218  Filter="h;hpp;hxx;hm;inl">
  219  <File
  220  RelativePath="compareutil.h">
  221  </File>
  222  <File
  223  RelativePath="resource.h">
  224  </File>
  225  <File
  226  RelativePath=".\StdAfx.h">
  227  </File>
  228  </Filter>
  229  </Files>
  230  <Globals>
  231  </Globals>
  232 </VisualStudioProject>