Compared files  

Left
C:\SDK\wxWidgets-2.6.2\contrib\src\stc\scintilla\src\LineMarker.cxx
Last modified2003-04-29 12:01:04.001 +0200
Size10.4 Kb (300 Lines)
EncodingLatin 1 - ANSI (CP1252) default
Right
C:\SDK\wxWidgets-2.6.3\contrib\src\stc\scintilla\src\LineMarker.cxx
Last modified2006-03-16 13:07:08.000 +0100
Size10.5 Kb (302 Lines)
EncodingLatin 1 - ANSI (CP1252) default


   Comparison Statistics  

Detailed Statistics

All Changes
 BlocksLines
Unchanged3299
Inserted12
Deleted00
Ignored00
Changed12



   Comparison Details  

281 skipped lines
282 282         surface->LineTo(right - 5, centreY + 5);
283 283         right += 4;
284 284         }
285     } else { // SC_MARK_SHORTARROW 285     } else if (markType == SC_MARK_SHORTARROW) {
286 286         Point pts[] = {
287 287         Point(centreX, centreY + dimOn2),
288 288         Point(centreX + dimOn2, centreY),
6 skipped lines
295 295         };
296 296         surface->Polygon(pts, sizeof(pts) / sizeof(pts[0]),
297 297         fore.allocated, back.allocated);
  298     } else { // SC_MARK_FULLRECT
  299         surface->FillRectangle(rcWhole, back.allocated);
298 300     }
299 301 }
300 302  

   Text comparison Options  

Syntax colouring language used: C / C++
Match character case: yes.
Match line endings: no.
Match spaces

At start of lines: yes,
In middle of lines: yes,
At end of lines: yes.
Blank lines as empty lines: no.
Activate comparison algorithm
At word level: yes,
At character level: no.


   Legend  

Unchanged lineExample of unchanged line
Modified lineExample of modified line
Added lineExample of added line
Removed lineExample of removed line
Ignored lineExample of ignored line

This report has been generated by Ellié Computing Merge on 2006-09-07 15:48:33.001 +0200.
© 2005-2006 Ellié Computing http://www.elliecomputing.com. All rights reserved.