21. Araxis Merge File Comparison Report

Produced by Araxis Merge on Mon May 18 06:28:33 2009 UTC. 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 Firefox or Internet Explorer. For optimum results when printing this report, use landscape orientation and enable printing of background images and colours in your browser.

21.1 Files compared

# Location File Last Modified
1 D:\Dolphin-v.6.1.5\ray\modules\global\xml config.xml Tue Apr 28 03:42:41 2009 UTC
2 D:\Dolphin-v.6.1.6\ray\modules\global\xml config.xml Wed May 13 06:58:50 2009 UTC

21.2 Comparison summary

Description Between
Files 1 and 2
Text Blocks Lines
Unchanged 0 0
Changed 1 2
Inserted 0 0
Removed 0 0

21.3 Comparison options

Whitespace All differences in whitespace within lines are ignored
Character case Differences in character case are ignored
Line endings Differences in line endings (CR and LF characters) are significant
CR/LF characters Not shown in the comparison detail

21.4 Active regular expressions

No regular expressions were active.

21.5 Comparison detail

1   <items><it em   key="regis tered"><![ CDATA[fals e]]></item ><item   key="SiteN ame"><![CD ATA[]]></i tem><item   key="useRM S"><![CDAT A[ tru e]]></item ><item   key="RMSIP "><![CDATA [ 10.0 . 0 . 3 ]]></item> <item   key="RMSPo rt"><![CDA TA[1 935 ]]></item> <item   key="RMSHt tpPort"><! [CDATA[ 5 080]]></it em><item   key="backC olor"><![C DATA[FFFFF F]]></item ><item   key="opaqu eMode"><![ CDATA[true ]]></item> </items>   1   <items><it em   key="regis tered"><![ CDATA[fals e]]></item ><item   key="SiteN ame"><![CD ATA[]]></i tem><item   key="useRM S"><![CDAT A[ fals e]]></item ><item   key="RMSIP "><![CDATA [ rms . boonex . com ]]></item> <item   key="RMSPo rt"><![CDA TA[1 0000 ]]></item> <item   key="RMSHt tpPort"><! [CDATA[ 10 080]]></it em><item   key="backC olor"><![C DATA[FFFFF F]]></item ><item   key="opaqu eMode"><![ CDATA[true ]]></item> </items>