﻿<?xml version="1.0" encoding="utf-8" ?>

<mg:report version="1.0" xmlns:mg="http://www.araxis.com/2002/Merge/Reporting" type="FolderComparison">
<mg:metaData>
  <mg:title>Araxis Merge Folder Comparison Report</mg:title>
  <mg:id show="false">0</mg:id>
  <mg:date>Sat Apr 12 16:07:37 2003</mg:date>
<mg:options>
	<mg:option name="clIgnWhitespace">1</mg:option>
	<mg:option name="clIgnoreCase">0</mg:option>
	<mg:option name="clIgnoreLineEndings">1</mg:option>
	<mg:option name="clHideCRLF">1</mg:option>
	<mg:option name="clThoroughComparison">1</mg:option>
	<mg:option name="clQuickDiffForLargeFiles">1</mg:option>
	<mg:option name="clQuickDiffLimit">512</mg:option>
	<mg:option name="clTopLevelFilesOnly">0</mg:option>
	<mg:option name="clShowUnchanged">0</mg:option>
	<mg:option name="clIgnoreFilter">0</mg:option>
	<mg:option name="csDirFilter">*.obj;*.o;*.cab;*.exe;*.dll;*.map;*.pch;*.idb;*.ncb;*.vcp;*.aps;*.res;*.sbr;*.bsc;*.ilk;*.pdb;*.ide;*.class;*.tlb;*.hlp;*.lib;*.exp;*.pdf;*.zip;*.jar;Debug\;Release\;WinDebug\;WinRel\;CVS\;RCS\</mg:option>
	<mg:option name="clIncludeFilterOn">0</mg:option>
	<mg:option name="csIncludeFilter">*.idl</mg:option>
	<mg:option name="clShowChangesColumn">1</mg:option>
	<mg:option name="clShowFileStamps">0</mg:option>

	<mg:regexps>
		<mg:regexp enabled="false">
			<mg:expression>^[ \t]*$</mg:expression>
			<mg:description>Blank lines</mg:description>
		</mg:regexp>
		<mg:regexp enabled="false">
			<mg:expression>[ \t]*//[^&quot;]*$</mg:expression>
			<mg:description>C++ comments</mg:description>
		</mg:regexp>
		<mg:regexp enabled="false">
			<mg:expression>^[ \t]*//.*\$(Date|Archive|Author|Header|JustDate|Modtime|Revision|Workfile):.*\$.*$</mg:expression>
			<mg:description>SourceSafe comments</mg:description>
		</mg:regexp>
		<mg:regexp enabled="false">
			<mg:expression>^[ \t]*//(:(Header|Source):|.*Generated.*Genitor).*\$</mg:expression>
			<mg:description>Genitor comments</mg:description>
		</mg:regexp>
		<mg:regexp enabled="false">
			<mg:expression>\$(Archive|Author|Date|Header|JustDate|Logfile|Modtime|Revision|Workfile):[^$]*\$</mg:expression>
			<mg:description>SourceSafe keywords</mg:description>
		</mg:regexp>
		<mg:regexp enabled="false">
			<mg:expression>^[ \t]*'.*$</mg:expression>
			<mg:description>Visual Basic comments</mg:description>
		</mg:regexp>
		<mg:regexp enabled="false">
			<mg:expression>^[ \t]*(//|--).*\$(Id|Revision|Date|Log):.*\$</mg:expression>
			<mg:description>CVS comments</mg:description>
		</mg:regexp>
		<mg:regexp enabled="false">
			<mg:expression></mg:expression>
			<mg:description></mg:description>
		</mg:regexp>
		<mg:regexp enabled="false">
			<mg:expression></mg:expression>
			<mg:description></mg:description>
		</mg:regexp>
		<mg:regexp enabled="false">
			<mg:expression></mg:expression>
			<mg:description></mg:description>
		</mg:regexp>
	</mg:regexps>
</mg:options>
<mg:folderDetails folder="1">
  <mg:name>compare</mg:name>
  <mg:location>c:\scm\dev\Software\Products\merge\6.0\Merge\</mg:location>
</mg:folderDetails>
<mg:folderDetails folder="2">
  <mg:name>compare</mg:name>
  <mg:location>c:\scm\dev\Software\Products\merge\6.5\Merge\</mg:location>
</mg:folderDetails>
  <mg:changeSummaries set="all">
    <mg:changeSummary folders="1,2">
  	  <mg:changeCount type="unchanged" files="5" blocks="38" lines="1343" />
  	  <mg:changeCount type="removed" files="0" blocks="0" lines="0" />
  	  <mg:changeCount type="inserted" files="1" blocks="1" lines="0" />
  	  <mg:changeCount type="changed" files="3" blocks="30" lines="80" />
    </mg:changeSummary>
  </mg:changeSummaries>
  <mg:changeSummaries set="selected" fileCount="0">
    <mg:changeSummary folders="1,2">
  	  <mg:changeCount type="unchanged" files="0" blocks="0" lines="0" />
  	  <mg:changeCount type="removed" files="0" blocks="0" lines="0" />
  	  <mg:changeCount type="inserted" files="0" blocks="0" lines="0" />
  	  <mg:changeCount type="changed" files="0" blocks="0" lines="0" />
    </mg:changeSummary>
  </mg:changeSummaries>
		<mg:classes folder="1">
<mg:class name="U">
	<mg:cssAttribute name="color">#000000</mg:cssAttribute>
	<mg:cssAttribute name="background-color">#ffffff</mg:cssAttribute>
	<mg:cssAttribute name="font-family">Tahoma</mg:cssAttribute>
	<mg:cssAttribute name="font-weight">normal</mg:cssAttribute>
	<mg:cssAttribute name="font-style">normal</mg:cssAttribute>
	<mg:cssAttribute name="font-size">8pt</mg:cssAttribute>
	<mg:cssAttribute name="text-decoration">none</mg:cssAttribute>
</mg:class>
<mg:class name="R">
	<mg:cssAttribute name="color">#000000</mg:cssAttribute>
	<mg:cssAttribute name="background-color">#c0dcc0</mg:cssAttribute>
	<mg:cssAttribute name="font-family">Tahoma</mg:cssAttribute>
	<mg:cssAttribute name="font-weight">normal</mg:cssAttribute>
	<mg:cssAttribute name="font-style">normal</mg:cssAttribute>
	<mg:cssAttribute name="font-size">8pt</mg:cssAttribute>
	<mg:cssAttribute name="text-decoration">none</mg:cssAttribute>
</mg:class>
<mg:class name="I">
	<mg:cssAttribute name="color">#000000</mg:cssAttribute>
	<mg:cssAttribute name="background-color">#c0dcc0</mg:cssAttribute>
	<mg:cssAttribute name="font-family">Tahoma</mg:cssAttribute>
	<mg:cssAttribute name="font-weight">normal</mg:cssAttribute>
	<mg:cssAttribute name="font-style">normal</mg:cssAttribute>
	<mg:cssAttribute name="font-size">8pt</mg:cssAttribute>
	<mg:cssAttribute name="text-decoration">none</mg:cssAttribute>
</mg:class>
<mg:class name="C">
	<mg:cssAttribute name="color">#000000</mg:cssAttribute>
	<mg:cssAttribute name="background-color">#a6caf0</mg:cssAttribute>
	<mg:cssAttribute name="font-family">Tahoma</mg:cssAttribute>
	<mg:cssAttribute name="font-weight">normal</mg:cssAttribute>
	<mg:cssAttribute name="font-style">normal</mg:cssAttribute>
	<mg:cssAttribute name="font-size">8pt</mg:cssAttribute>
	<mg:cssAttribute name="text-decoration">none</mg:cssAttribute>
</mg:class>
		</mg:classes>
		<mg:classes folder="2">
<mg:class name="U">
	<mg:cssAttribute name="color">#000000</mg:cssAttribute>
	<mg:cssAttribute name="background-color">#ffffff</mg:cssAttribute>
	<mg:cssAttribute name="font-family">Tahoma</mg:cssAttribute>
	<mg:cssAttribute name="font-weight">normal</mg:cssAttribute>
	<mg:cssAttribute name="font-style">normal</mg:cssAttribute>
	<mg:cssAttribute name="font-size">8pt</mg:cssAttribute>
	<mg:cssAttribute name="text-decoration">none</mg:cssAttribute>
</mg:class>
<mg:class name="R">
	<mg:cssAttribute name="color">#000000</mg:cssAttribute>
	<mg:cssAttribute name="background-color">#c0dcc0</mg:cssAttribute>
	<mg:cssAttribute name="font-family">Tahoma</mg:cssAttribute>
	<mg:cssAttribute name="font-weight">normal</mg:cssAttribute>
	<mg:cssAttribute name="font-style">normal</mg:cssAttribute>
	<mg:cssAttribute name="font-size">8pt</mg:cssAttribute>
	<mg:cssAttribute name="text-decoration">none</mg:cssAttribute>
</mg:class>
<mg:class name="I">
	<mg:cssAttribute name="color">#000000</mg:cssAttribute>
	<mg:cssAttribute name="background-color">#c0dcc0</mg:cssAttribute>
	<mg:cssAttribute name="font-family">Tahoma</mg:cssAttribute>
	<mg:cssAttribute name="font-weight">normal</mg:cssAttribute>
	<mg:cssAttribute name="font-style">normal</mg:cssAttribute>
	<mg:cssAttribute name="font-size">8pt</mg:cssAttribute>
	<mg:cssAttribute name="text-decoration">none</mg:cssAttribute>
</mg:class>
<mg:class name="C">
	<mg:cssAttribute name="color">#000000</mg:cssAttribute>
	<mg:cssAttribute name="background-color">#a6caf0</mg:cssAttribute>
	<mg:cssAttribute name="font-family">Tahoma</mg:cssAttribute>
	<mg:cssAttribute name="font-weight">normal</mg:cssAttribute>
	<mg:cssAttribute name="font-style">normal</mg:cssAttribute>
	<mg:cssAttribute name="font-size">8pt</mg:cssAttribute>
	<mg:cssAttribute name="text-decoration">none</mg:cssAttribute>
</mg:class>
		</mg:classes>
</mg:metaData>
<mg:rowData>
<mg:row selected="false" url="FolderComparisonReport_files\FileComparisonReport1.xml" reportId="1">
  <mg:file name="compare.dsp" folder="1" size="5 KB" timestamp="01:01:16 17/03/2003" class="C" level="0" changeCount="2" icon="FolderComparisonReport_files/icon1.png"/>
  <mg:file name="compare.dsp" folder="2" size="5 KB" timestamp="00:52:32 08/04/2003" class="C" level="0" changeCount="0" icon="FolderComparisonReport_files/icon2.png"/>
</mg:row>
<mg:row selected="false" url="FolderComparisonReport_files\FileComparisonReport2.xml" reportId="2">
  <mg:file name="compare.rc" folder="1" size="3 KB" timestamp="01:01:18 17/03/2003" class="U" level="0" changeCount="0" icon="FolderComparisonReport_files/icon3.png"/>
  <mg:file name="compare.rc" folder="2" size="3 KB" timestamp="00:52:32 08/04/2003" class="U" level="0" changeCount="0" icon="FolderComparisonReport_files/icon4.png"/>
</mg:row>
<mg:row selected="false" url="FolderComparisonReport_files\FileComparisonReport3.xml" reportId="3">
  <mg:file name="compare.vcproj" folder="2" size="7 KB" timestamp="00:59:47 12/04/2003" class="I" level="0" changeCount="0" icon="FolderComparisonReport_files/icon5.png"/>
</mg:row>
<mg:row selected="false" url="FolderComparisonReport_files\FileComparisonReport4.xml" reportId="4">
  <mg:file name="compareutil.cpp" folder="1" size="14 KB" timestamp="01:01:18 17/03/2003" class="C" level="0" changeCount="11" icon="FolderComparisonReport_files/icon6.png"/>
  <mg:file name="compareutil.cpp" folder="2" size="14 KB" timestamp="00:52:34 08/04/2003" class="C" level="0" changeCount="0" icon="FolderComparisonReport_files/icon7.png"/>
</mg:row>
<mg:row selected="false" url="FolderComparisonReport_files\FileComparisonReport5.xml" reportId="5">
  <mg:file name="compareutil.h" folder="1" size="16 KB" timestamp="01:01:18 17/03/2003" class="C" level="0" changeCount="17" icon="FolderComparisonReport_files/icon8.png"/>
  <mg:file name="compareutil.h" folder="2" size="16 KB" timestamp="00:52:34 08/04/2003" class="C" level="0" changeCount="0" icon="FolderComparisonReport_files/icon9.png"/>
</mg:row>
<mg:row selected="false" url="FolderComparisonReport_files\FileComparisonReport6.xml" reportId="6">
  <mg:file name="ReadMe.txt" folder="1" size="2 KB" timestamp="01:01:18 17/03/2003" class="U" level="0" changeCount="0" icon="FolderComparisonReport_files/icon10.png"/>
  <mg:file name="ReadMe.txt" folder="2" size="2 KB" timestamp="00:52:35 08/04/2003" class="U" level="0" changeCount="0" icon="FolderComparisonReport_files/icon11.png"/>
</mg:row>
<mg:row selected="false" url="FolderComparisonReport_files\FileComparisonReport7.xml" reportId="7">
  <mg:file name="resource.h" folder="1" size="1 KB" timestamp="01:01:18 17/03/2003" class="U" level="0" changeCount="0" icon="FolderComparisonReport_files/icon12.png"/>
  <mg:file name="resource.h" folder="2" size="1 KB" timestamp="00:52:35 08/04/2003" class="U" level="0" changeCount="0" icon="FolderComparisonReport_files/icon13.png"/>
</mg:row>
<mg:row selected="false" url="FolderComparisonReport_files\FileComparisonReport8.xml" reportId="8">
  <mg:file name="StdAfx.cpp" folder="1" size="1 KB" timestamp="01:01:18 17/03/2003" class="U" level="0" changeCount="0" icon="FolderComparisonReport_files/icon14.png"/>
  <mg:file name="StdAfx.cpp" folder="2" size="1 KB" timestamp="00:52:35 08/04/2003" class="U" level="0" changeCount="0" icon="FolderComparisonReport_files/icon15.png"/>
</mg:row>
<mg:row selected="false" url="FolderComparisonReport_files\FileComparisonReport9.xml" reportId="9">
  <mg:file name="StdAfx.h" folder="1" size="2 KB" timestamp="01:01:19 17/03/2003" class="U" level="0" changeCount="0" icon="FolderComparisonReport_files/icon16.png"/>
  <mg:file name="StdAfx.h" folder="2" size="2 KB" timestamp="00:52:41 08/04/2003" class="U" level="0" changeCount="0" icon="FolderComparisonReport_files/icon17.png"/>
</mg:row>
</mg:rowData>
</mg:report>
