11. Araxis Merge File Comparison Report

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

11.1 Files compared

# Location File Last Modified
1 D:\Dolphin-v.6.1.5\modules fc.aemod Thu Apr 23 04:12:46 2009 UTC
2 Mon May 18 06:28:29 2009 UTC

11.2 Comparison summary

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

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

11.4 Active regular expressions

No regular expressions were active.

11.5 Comparison detail

1   INSERT INT O `Modules ` VALUES ( '', 'fchat ', 'global  $mods;\r\ n\r\n/**\r \n*  ''Mod uleDirecto ry''\r\n*      Specif ies name o f director y, where c hat is loc ated\r\n*  (string)\r \n*/\r\n\r \n$mods['' fchat''][' 'ModuleDir ectory'']  = ''chat/' ';', '', ' ', '', '',  '', '', ' global $si te;\r\nhea der("Locat ion: {$sit e[''url''] }chat/flas hchat.php" );', 'chat ', 'Flash  Chat');