﻿<?xml version="1.0" encoding="utf-8" ?>

<mg:report version="1.0" xmlns:mg="http://www.araxis.com/2002/Merge/Reporting" type="FileComparison">
<mg:metaData>
  <mg:title>Araxis Merge File Comparison Report</mg:title>
  <mg:id show="true">6</mg:id>
  <mg:date>Sat Apr 12 16:07:38 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: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:fileDetails file="1">
  <mg:name>ReadMe.txt</mg:name>
  <mg:title></mg:title>
  <mg:location>c:\scm\dev\Software\Products\merge\6.0\Merge\compare</mg:location>
  <mg:lastModified>Mon Mar 17 01:01:18 2003 UTC</mg:lastModified>
</mg:fileDetails>
<mg:fileDetails file="2">
  <mg:name>ReadMe.txt</mg:name>
  <mg:title></mg:title>
  <mg:location>c:\scm\dev\Software\Products\merge\6.5\Merge\compare</mg:location>
  <mg:lastModified>Tue Apr 8 00:52:35 2003 UTC</mg:lastModified>
</mg:fileDetails>
<mg:changeSummaries>
  <mg:changeSummary files="1,2">
	  <mg:changeCount type="unchanged" blocks="1" lines="35" />
	  <mg:changeCount type="removed" blocks="0" lines="0" />
	  <mg:changeCount type="inserted" blocks="0" lines="0" />
	  <mg:changeCount type="changed" blocks="0" lines="0" />
  </mg:changeSummary>
</mg:changeSummaries>
		<mg:classes file="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">Courier New</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">#ff0000</mg:cssAttribute>
	<mg:cssAttribute name="background-color">#c0dcc0</mg:cssAttribute>
	<mg:cssAttribute name="font-family">Courier New</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">#ff0000</mg:cssAttribute>
	<mg:cssAttribute name="background-color">#c0dcc0</mg:cssAttribute>
	<mg:cssAttribute name="font-family">Courier New</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">#ff0000</mg:cssAttribute>
	<mg:cssAttribute name="background-color">#a6caf0</mg:cssAttribute>
	<mg:cssAttribute name="font-family">Courier New</mg:cssAttribute>
	<mg:cssAttribute name="font-weight">bold</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 file="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">Courier New</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">#ff0000</mg:cssAttribute>
	<mg:cssAttribute name="background-color">#c0dcc0</mg:cssAttribute>
	<mg:cssAttribute name="font-family">Courier New</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">#ff0000</mg:cssAttribute>
	<mg:cssAttribute name="background-color">#c0dcc0</mg:cssAttribute>
	<mg:cssAttribute name="font-family">Courier New</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">#ff0000</mg:cssAttribute>
	<mg:cssAttribute name="background-color">#a6caf0</mg:cssAttribute>
	<mg:cssAttribute name="font-family">Courier New</mg:cssAttribute>
	<mg:cssAttribute name="font-weight">bold</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:rowGroup>
    <mg:row>
      <mg:ln file="1" number="1" class="U">
        <mg:sg class="U">========================================================================<mg:cr/><mg:lf/></mg:sg>
      </mg:ln>
      <mg:ln file="2" number="1" class="U">
        <mg:sg class="U">========================================================================<mg:cr/><mg:lf/></mg:sg>
      </mg:ln>
    </mg:row>
    <mg:row>
      <mg:ln file="1" number="2" class="U">
        <mg:sg class="U"><mg:s/><mg:s/><mg:s/><mg:s/><mg:s/><mg:s/><mg:s/>WIN32<mg:s/>APPLICATION<mg:s/>:<mg:s/>compare<mg:cr/><mg:lf/></mg:sg>
      </mg:ln>
      <mg:ln file="2" number="2" class="U">
        <mg:sg class="U"><mg:s/><mg:s/><mg:s/><mg:s/><mg:s/><mg:s/><mg:s/>WIN32<mg:s/>APPLICATION<mg:s/>:<mg:s/>compare<mg:cr/><mg:lf/></mg:sg>
      </mg:ln>
    </mg:row>
    <mg:row>
      <mg:ln file="1" number="3" class="U">
        <mg:sg class="U">========================================================================<mg:cr/><mg:lf/></mg:sg>
      </mg:ln>
      <mg:ln file="2" number="3" class="U">
        <mg:sg class="U">========================================================================<mg:cr/><mg:lf/></mg:sg>
      </mg:ln>
    </mg:row>
    <mg:row>
      <mg:ln file="1" number="4" class="U">
        <mg:sg class="U"><mg:cr/><mg:lf/></mg:sg>
      </mg:ln>
      <mg:ln file="2" number="4" class="U">
        <mg:sg class="U"><mg:cr/><mg:lf/></mg:sg>
      </mg:ln>
    </mg:row>
    <mg:row>
      <mg:ln file="1" number="5" class="U">
        <mg:sg class="U"><mg:cr/><mg:lf/></mg:sg>
      </mg:ln>
      <mg:ln file="2" number="5" class="U">
        <mg:sg class="U"><mg:cr/><mg:lf/></mg:sg>
      </mg:ln>
    </mg:row>
    <mg:row>
      <mg:ln file="1" number="6" class="U">
        <mg:sg class="U">AppWizard<mg:s/>has<mg:s/>created<mg:s/>this<mg:s/>compare<mg:s/>application<mg:s/>for<mg:s/>you.<mg:s/><mg:s/><mg:cr/><mg:lf/></mg:sg>
      </mg:ln>
      <mg:ln file="2" number="6" class="U">
        <mg:sg class="U">AppWizard<mg:s/>has<mg:s/>created<mg:s/>this<mg:s/>compare<mg:s/>application<mg:s/>for<mg:s/>you.<mg:s/><mg:s/><mg:cr/><mg:lf/></mg:sg>
      </mg:ln>
    </mg:row>
    <mg:row>
      <mg:ln file="1" number="7" class="U">
        <mg:sg class="U"><mg:cr/><mg:lf/></mg:sg>
      </mg:ln>
      <mg:ln file="2" number="7" class="U">
        <mg:sg class="U"><mg:cr/><mg:lf/></mg:sg>
      </mg:ln>
    </mg:row>
    <mg:row>
      <mg:ln file="1" number="8" class="U">
        <mg:sg class="U">This<mg:s/>file<mg:s/>contains<mg:s/>a<mg:s/>summary<mg:s/>of<mg:s/>what<mg:s/>you<mg:s/>will<mg:s/>find<mg:s/>in<mg:s/>each<mg:s/>of<mg:s/>the<mg:s/>files<mg:s/>that<mg:cr/><mg:lf/></mg:sg>
      </mg:ln>
      <mg:ln file="2" number="8" class="U">
        <mg:sg class="U">This<mg:s/>file<mg:s/>contains<mg:s/>a<mg:s/>summary<mg:s/>of<mg:s/>what<mg:s/>you<mg:s/>will<mg:s/>find<mg:s/>in<mg:s/>each<mg:s/>of<mg:s/>the<mg:s/>files<mg:s/>that<mg:cr/><mg:lf/></mg:sg>
      </mg:ln>
    </mg:row>
    <mg:row>
      <mg:ln file="1" number="9" class="U">
        <mg:sg class="U">make<mg:s/>up<mg:s/>your<mg:s/>compare<mg:s/>application.<mg:cr/><mg:lf/></mg:sg>
      </mg:ln>
      <mg:ln file="2" number="9" class="U">
        <mg:sg class="U">make<mg:s/>up<mg:s/>your<mg:s/>compare<mg:s/>application.<mg:cr/><mg:lf/></mg:sg>
      </mg:ln>
    </mg:row>
    <mg:row>
      <mg:ln file="1" number="10" class="U">
        <mg:sg class="U"><mg:cr/><mg:lf/></mg:sg>
      </mg:ln>
      <mg:ln file="2" number="10" class="U">
        <mg:sg class="U"><mg:cr/><mg:lf/></mg:sg>
      </mg:ln>
    </mg:row>
    <mg:omitted rows="15"/>
    <mg:row>
      <mg:ln file="1" number="26" class="U">
        <mg:sg class="U"><mg:cr/><mg:lf/></mg:sg>
      </mg:ln>
      <mg:ln file="2" number="26" class="U">
        <mg:sg class="U"><mg:cr/><mg:lf/></mg:sg>
      </mg:ln>
    </mg:row>
    <mg:row>
      <mg:ln file="1" number="27" class="U">
        <mg:sg class="U"><mg:cr/><mg:lf/></mg:sg>
      </mg:ln>
      <mg:ln file="2" number="27" class="U">
        <mg:sg class="U"><mg:cr/><mg:lf/></mg:sg>
      </mg:ln>
    </mg:row>
    <mg:row>
      <mg:ln file="1" number="28" class="U">
        <mg:sg class="U">/////////////////////////////////////////////////////////////////////////////<mg:cr/><mg:lf/></mg:sg>
      </mg:ln>
      <mg:ln file="2" number="28" class="U">
        <mg:sg class="U">/////////////////////////////////////////////////////////////////////////////<mg:cr/><mg:lf/></mg:sg>
      </mg:ln>
    </mg:row>
    <mg:row>
      <mg:ln file="1" number="29" class="U">
        <mg:sg class="U">Other<mg:s/>notes:<mg:cr/><mg:lf/></mg:sg>
      </mg:ln>
      <mg:ln file="2" number="29" class="U">
        <mg:sg class="U">Other<mg:s/>notes:<mg:cr/><mg:lf/></mg:sg>
      </mg:ln>
    </mg:row>
    <mg:row>
      <mg:ln file="1" number="30" class="U">
        <mg:sg class="U"><mg:cr/><mg:lf/></mg:sg>
      </mg:ln>
      <mg:ln file="2" number="30" class="U">
        <mg:sg class="U"><mg:cr/><mg:lf/></mg:sg>
      </mg:ln>
    </mg:row>
    <mg:row>
      <mg:ln file="1" number="31" class="U">
        <mg:sg class="U">AppWizard<mg:s/>uses<mg:s/>&quot;TODO:&quot;<mg:s/>to<mg:s/>indicate<mg:s/>parts<mg:s/>of<mg:s/>the<mg:s/>source<mg:s/>code<mg:s/>you<mg:cr/><mg:lf/></mg:sg>
      </mg:ln>
      <mg:ln file="2" number="31" class="U">
        <mg:sg class="U">AppWizard<mg:s/>uses<mg:s/>&quot;TODO:&quot;<mg:s/>to<mg:s/>indicate<mg:s/>parts<mg:s/>of<mg:s/>the<mg:s/>source<mg:s/>code<mg:s/>you<mg:cr/><mg:lf/></mg:sg>
      </mg:ln>
    </mg:row>
    <mg:row>
      <mg:ln file="1" number="32" class="U">
        <mg:sg class="U">should<mg:s/>add<mg:s/>to<mg:s/>or<mg:s/>customize.<mg:cr/><mg:lf/></mg:sg>
      </mg:ln>
      <mg:ln file="2" number="32" class="U">
        <mg:sg class="U">should<mg:s/>add<mg:s/>to<mg:s/>or<mg:s/>customize.<mg:cr/><mg:lf/></mg:sg>
      </mg:ln>
    </mg:row>
    <mg:row>
      <mg:ln file="1" number="33" class="U">
        <mg:sg class="U"><mg:cr/><mg:lf/></mg:sg>
      </mg:ln>
      <mg:ln file="2" number="33" class="U">
        <mg:sg class="U"><mg:cr/><mg:lf/></mg:sg>
      </mg:ln>
    </mg:row>
    <mg:row>
      <mg:ln file="1" number="34" class="U">
        <mg:sg class="U"><mg:cr/><mg:lf/></mg:sg>
      </mg:ln>
      <mg:ln file="2" number="34" class="U">
        <mg:sg class="U"><mg:cr/><mg:lf/></mg:sg>
      </mg:ln>
    </mg:row>
    <mg:row>
      <mg:ln file="1" number="35" class="U">
        <mg:sg class="U">/////////////////////////////////////////////////////////////////////////////<mg:cr/><mg:lf/></mg:sg>
      </mg:ln>
      <mg:ln file="2" number="35" class="U">
        <mg:sg class="U">/////////////////////////////////////////////////////////////////////////////<mg:cr/><mg:lf/></mg:sg>
      </mg:ln>
    </mg:row>
  </mg:rowGroup>
</mg:rowData>
</mg:report>
