31. Araxis Merge File Comparison Report

Produced by Araxis Merge on Mon May 18 06:28:40 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.

31.1 Files compared

# Location File Last Modified
1 D:\Dolphin-v.6.1.5\ray\modules\presence\xml config.xml Tue Apr 28 03:42:55 2009 UTC
2 D:\Dolphin-v.6.1.6\ray\modules\presence\xml config.xml Wed May 13 04:52:30 2009 UTC

31.2 Comparison summary

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

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

31.4 Active regular expressions

No regular expressions were active.

31.5 Comparison detail

1   <items><it em   key="updat eInterval" ><![CDATA[ 20]]></ite m><item   key="urlDe sktop"><![ CDATA[]]>< /item><ite m   key="userM usic"><![C DATA[#musi c#]]></ite m><item   key="userV ideo"><![C DATA[#vide o#]]></ite m><item   key="userI m"><![CDAT A[#im#]]>< /item><ite m   key="userM ail"><![CD ATA[#siteU rl# mail.php?m ode= compose &reci p ient_ id=#user#] ]></item>< item   key="useMa ilbox"><![ CDATA[true ]]></item> <item   key="useFr iends"><![ CDATA[true ]]></item> <item   key="useIm "><![CDATA [true]]></ item></ite ms>   1   <items><it em   key="updat eInterval" ><![CDATA[ 20]]></ite m><item   key="urlDe sktop"><![ CDATA[]]>< /item><ite m   key="userM usic"><![C DATA[#musi c#]]></ite m><item   key="userV ideo"><![C DATA[#vide o#]]></ite m><item   key="userI m"><![CDAT A[#im#]]>< /item><ite m   key="userM ail"><![CD ATA[#siteU rl#
compose . p hp? ID=#user#] ]></item>< item   key="useMa ilbox"><![ CDATA[true ]]></item> <item   key="useFr iends"><![ CDATA[true ]]></item> <item   key="useIm "><![CDATA [true]]></ item></ite ms>