Compared folders  

Left
C:\SDK\wxWidgets-2.6.2\contrib\src
EncodingLatin 1 - ANSI (CP1252) default
Right
C:\SDK\wxWidgets-2.6.3\contrib\src
EncodingLatin 1 - ANSI (CP1252) default


   Comparison Statistics  

Global Statistics

Files and FoldersBetween Left and Right
Unchanged137
Inserted0
Deleted0
ChangedAll files*71
Text files70
Binary files1
*The sum "All files" may be greater than the actual sum of the number per file type, indeed, the files designated as different by metadata-based rules (size, date...) are not open and their type is not determined in order to accelerate the differentiation process.

This folder cannot be merged automatically. There are 71 conflicts concerning files to solve manually.

Detailed Statistics for Text Files

All Changes
 BlocksLines
Unchanged117941330
Inserted3642158
Deleted74272
Ignored00
Changed6715557



   Comparison Details  

LeftChange CountRight
src
71
src
animate
2
animate
(16.3 Kb)
24
(16 Kb)
(16 Kb)
12
(16.4 Kb)
readme.txt
(1.3 Kb)
 
readme.txt
(1.3 Kb)
applet
0
applet
applet.cpp
(2.7 Kb)
0
applet.cpp
(2.7 Kb)
appletwindow.cpp
(26.9 Kb)
0
appletwindow.cpp
(26.9 Kb)
echovar.cpp
(7.5 Kb)
0
echovar.cpp
(7.5 Kb)
ifelsevar.cpp
(7.9 Kb)
0
ifelsevar.cpp
(7.9 Kb)
loadpage.cpp
(2.3 Kb)
0
loadpage.cpp
(2.3 Kb)
makefile
(889 Bytes)
0
makefile
(889 Bytes)
Makefile.in
(561 Bytes)
 
plugin.cpp
(2.1 Kb)
0
plugin.cpp
(2.1 Kb)
prepecho.cpp
(4 Kb)
0
prepecho.cpp
(4 Kb)
prepifelse.cpp
(14.5 Kb)
0
prepifelse.cpp
(14.5 Kb)
prepinclude.cpp
(5.3 Kb)
0
prepinclude.cpp
(5.3 Kb)
deprecated
13
deprecated
fl
3
fl
antiflickpl.cpp
(6.1 Kb)
0
antiflickpl.cpp
(6.1 Kb)
bardragpl.cpp
(26 Kb)
0
bardragpl.cpp
(26 Kb)
barhintspl.cpp
(14.6 Kb)
0
barhintspl.cpp
(14.6 Kb)
cbcustom.cpp
(5.3 Kb)
0
cbcustom.cpp
(5.3 Kb)
(81.7 Kb)
3
(81.4 Kb)
dyntbar.cpp
(16.5 Kb)
0
dyntbar.cpp
(16.5 Kb)
dyntbarhnd.cpp
(1.3 Kb)
0
dyntbarhnd.cpp
(1.3 Kb)
files.lst
(439 Bytes)
0
files.lst
(439 Bytes)
frmview.cpp
(9.1 Kb)
0
frmview.cpp
(9.1 Kb)
garbagec.cpp
(4.5 Kb)
0
garbagec.cpp
(4.5 Kb)
gcupdatesmgr.cpp
(11 Kb)
0
gcupdatesmgr.cpp
(11 Kb)
hintanimpl.cpp
(10.5 Kb)
0
hintanimpl.cpp
(10.5 Kb)
(20 Kb)
12
(20.4 Kb)
(22.2 Kb)
6
(22.4 Kb)
panedrawpl.cpp
(36.8 Kb)
0
panedrawpl.cpp
(36.8 Kb)
rowdragpl.cpp
(38.4 Kb)
0
rowdragpl.cpp
(38.4 Kb)
rowlayoutpl.cpp
(29.2 Kb)
0
rowlayoutpl.cpp
(29.2 Kb)
toolwnd.cpp
(26.7 Kb)
0
toolwnd.cpp
(26.7 Kb)
updatesmgr.cpp
(7.8 Kb)
0
updatesmgr.cpp
(7.8 Kb)
foldbar
1
foldbar
captionbar.cpp
(12.2 Kb)
0
captionbar.cpp
(12.2 Kb)
foldpanelbar.cpp
(10 Kb)
0
foldpanelbar.cpp
(10 Kb)
foldpanelitem.cpp
(6.9 Kb)
0
foldpanelitem.cpp
(6.9 Kb)
icon_collapsed.old.xpm
(421 Bytes)
0
icon_collapsed.old.xpm
(421 Bytes)
icon_collapsed.xpm
(910 Bytes)
0
icon_collapsed.xpm
(910 Bytes)
icon_expanded.old.xpm
(420 Bytes)
0
icon_expanded.old.xpm
(420 Bytes)
icon_expanded.xpm
(909 Bytes)
0
icon_expanded.xpm
(909 Bytes)
icon_theresmore.xpm
(521 Bytes)
0
icon_theresmore.xpm
(521 Bytes)
(16.8 Kb)
12
(17.1 Kb)
gizmos
1
gizmos
dynamicsash.cpp
(42.5 Kb)
0
dynamicsash.cpp
(42.5 Kb)
editlbox.cpp
(8.4 Kb)
0
editlbox.cpp
(8.4 Kb)
eldel.xpm
(416 Bytes)
0
eldel.xpm
(416 Bytes)
eldown.xpm
(402 Bytes)
0
eldown.xpm
(402 Bytes)
eledit.xpm
(417 Bytes)
0
eledit.xpm
(417 Bytes)
elnew.xpm
(446 Bytes)
0
elnew.xpm
(446 Bytes)
elup.xpm
(400 Bytes)
0
elup.xpm
(400 Bytes)
ledctrl.cpp
(11.1 Kb)
0
ledctrl.cpp
(11.1 Kb)
(27.8 Kb)
16
(28.4 Kb)
multicell.cpp
(21.6 Kb)
0
multicell.cpp
(21.6 Kb)
splittree.cpp
(21.4 Kb)
0
splittree.cpp
(21.4 Kb)
statpict.cpp
(3.7 Kb)
0
statpict.cpp
(3.7 Kb)
xh_statpict.cpp
(1.5 Kb)
0
xh_statpict.cpp
(1.5 Kb)
Makefile.in
(471 Bytes)
0
Makefile.in
(471 Bytes)
mmedia
1
mmedia
cdbase.cpp
(1.6 Kb)
0
cdbase.cpp
(1.6 Kb)
cdunix.cpp
(5.3 Kb)
0
cdunix.cpp
(5.3 Kb)
cdwin.cpp
(5.8 Kb)
0
cdwin.cpp
(5.8 Kb)
g711.cpp
(9 Kb)
0
g711.cpp
(9 Kb)
g721.cpp
(5.7 Kb)
0
g721.cpp
(5.7 Kb)
g723_24.cpp
(5 Kb)
0
g723_24.cpp
(5 Kb)
g723_40.cpp
(6 Kb)
0
g723_40.cpp
(6 Kb)
g72x.cpp
(17.4 Kb)
0
g72x.cpp
(17.4 Kb)
(23.3 Kb)
12
(23.7 Kb)
sndaiff.cpp
(5.8 Kb)
0
sndaiff.cpp
(5.8 Kb)
sndbase.cpp
(3.9 Kb)
0
sndbase.cpp
(3.9 Kb)
sndcodec.cpp
(991 Bytes)
0
sndcodec.cpp
(991 Bytes)
sndcpcm.cpp
(12.4 Kb)
0
sndcpcm.cpp
(12.4 Kb)
sndesd.cpp
(9.1 Kb)
0
sndesd.cpp
(9.1 Kb)
sndfile.cpp
(11 Kb)
0
sndfile.cpp
(11 Kb)
sndg72x.cpp
(7.8 Kb)
0
sndg72x.cpp
(7.8 Kb)
sndmsad.cpp
(9.6 Kb)
0
sndmsad.cpp
(9.6 Kb)
sndoss.cpp
(8.9 Kb)
0
sndoss.cpp
(8.9 Kb)
sndpcm.cpp
(2.1 Kb)
0
sndpcm.cpp
(2.1 Kb)
sndulaw.cpp
(4.3 Kb)
0
sndulaw.cpp
(4.3 Kb)
sndwav.cpp
(11.8 Kb)
0
sndwav.cpp
(11.8 Kb)
sndwin.cpp
(23.2 Kb)
0
sndwin.cpp
(23.2 Kb)
vidbase.cpp
(1.5 Kb)
0
vidbase.cpp
(1.5 Kb)
vidwin.cpp
(5.6 Kb)
0
vidwin.cpp
(5.6 Kb)
vidxanm.cpp
(11.9 Kb)
0
vidxanm.cpp
(11.9 Kb)
net
1
net
email.cpp
(2.9 Kb)
0
email.cpp
(2.9 Kb)
(16.7 Kb)
12
(17.1 Kb)
smapi.cpp
(15.6 Kb)
0
smapi.cpp
(15.6 Kb)
web.cpp
(700 Bytes)
0
web.cpp
(700 Bytes)
ogl
1
ogl
basic.cpp
(86.9 Kb)
0
basic.cpp
(86.9 Kb)
basic2.cpp
(52.2 Kb)
0
basic2.cpp
(52.2 Kb)
bmpshape.cpp
(2.3 Kb)
0
bmpshape.cpp
(2.3 Kb)
canvas.cpp
(15.3 Kb)
0
canvas.cpp
(15.3 Kb)
composit.cpp
(47.7 Kb)
0
composit.cpp
(47.7 Kb)
constrnt.cpp
(17.7 Kb)
0
constrnt.cpp
(17.7 Kb)
divided.cpp
(19.3 Kb)
0
divided.cpp
(19.3 Kb)
drawn.cpp
(63.1 Kb)
0
drawn.cpp
(63.1 Kb)
lines.cpp
(68.6 Kb)
0
lines.cpp
(68.6 Kb)
(18.5 Kb)
12
(18.9 Kb)
mfutils.cpp
(30.7 Kb)
0
mfutils.cpp
(30.7 Kb)
ogldiag.cpp
(18.8 Kb)
0
ogldiag.cpp
(18.8 Kb)
oglmisc.cpp
(21.7 Kb)
0
oglmisc.cpp
(21.7 Kb)
plot
1
plot
(15.7 Kb)
12
(16.1 Kb)
plot.cpp
(32.1 Kb)
0
plot.cpp
(32.1 Kb)
stc
59
stc
(35.5 Kb)
32
(38.1 Kb)
(35 Kb)
24
(35.9 Kb)
PlatWX.h
(146 Bytes)
0
PlatWX.h
(146 Bytes)
README.txt
(2.4 Kb)
 
README.txt
(2.4 Kb)
scintilla
53
scintilla
include
7
include
Accessor.h
(2.5 Kb)
0
Accessor.h
(2.5 Kb)
(2.5 Kb)
3
(2.6 Kb)
(13.5 Kb)
3
(13.7 Kb)
(2.9 Kb)
6
(3.1 Kb)
(21.2 Kb)
13
(27.2 Kb)
(21.7 Kb)
21
(22.5 Kb)
(1.4 Kb)
2
(1.4 Kb)
(8.1 Kb)
2
(8.2 Kb)
WindowAccessor.h
(1.7 Kb)
0
WindowAccessor.h
(1.7 Kb)
README.txt
(294 Bytes)
 
README.txt
(294 Bytes)
src
46
src
(3.8 Kb)
6
(3.6 Kb)
(1.8 Kb)
4
(1.9 Kb)
(8.3 Kb)
6
(8.3 Kb)
(1.6 Kb)
1
(1.6 Kb)
(28.1 Kb)
15
(28.1 Kb)
(6.4 Kb)
1
(6.4 Kb)
ContractionState.cxx
(6.4 Kb)
0
ContractionState.cxx
(6.4 Kb)
ContractionState.h
(1.4 Kb)
0
ContractionState.h
(1.4 Kb)
(38 Kb)
49
(40.5 Kb)
(8.8 Kb)
10
(8.9 Kb)
(4.5 Kb)
2
(4.6 Kb)
(1.9 Kb)
2
(2 Kb)
(204.3 Kb)
126
(206.2 Kb)
(15.9 Kb)
12
(16.1 Kb)
ExternalLexer.cxx
(5.7 Kb)
0
ExternalLexer.cxx
(5.7 Kb)
ExternalLexer.h
(2.6 Kb)
0
ExternalLexer.h
(2.6 Kb)
Indicator.cxx
(1.9 Kb)
0
Indicator.cxx
(1.9 Kb)
Indicator.h
(567 Bytes)
0
Indicator.h
(567 Bytes)
(4.8 Kb)
1
(4.8 Kb)
KeyMap.h
(890 Bytes)
0
KeyMap.h
(890 Bytes)
(4.7 Kb)
30
(5 Kb)
LexAda.cxx
(11.6 Kb)
0
LexAda.cxx
(11.6 Kb)
LexAPDL.cxx
(4.1 Kb)
0
LexAPDL.cxx
(4.1 Kb)
LexAsm.cxx
(5 Kb)
0
LexAsm.cxx
(5 Kb)
(5 Kb)
1
(5 Kb)
(20 Kb)
30
(27 Kb)
(6.2 Kb)
2
(6.4 Kb)
LexBaan.cxx
(5.6 Kb)
0
LexBaan.cxx
(5.6 Kb)
(17.8 Kb)
8
(18.5 Kb)
 
LexBasic.cxx
(10 Kb)
LexBullant.cxx
(6.1 Kb)
0
LexBullant.cxx
(6.1 Kb)
 
LexCaml.cxx
(12.2 Kb)
(13.8 Kb)
57
(21.4 Kb)
LexConf.cxx
(5.3 Kb)
0
LexConf.cxx
(5.3 Kb)
(12.2 Kb)
30
(13.8 Kb)
LexCrontab.cxx
(6.8 Kb)
0
LexCrontab.cxx
(6.8 Kb)
 
LexCsound.cxx
(6 Kb)
(8.4 Kb)
4
(9.5 Kb)
(7.2 Kb)
1
(7.2 Kb)
LexErlang.cxx
(16.2 Kb)
0
LexErlang.cxx
(16.2 Kb)
LexEScript.cxx
(7.8 Kb)
0
LexEScript.cxx
(7.8 Kb)
 
LexFlagship.cxx
(6.6 Kb)
LexForth.cxx
(11.6 Kb)
0
LexForth.cxx
(11.6 Kb)
(15.2 Kb)
2
(15.2 Kb)
(8.6 Kb)
1
(8.6 Kb)
 
LexHaskell.cxx
(7.3 Kb)
(58.3 Kb)
29
(60.6 Kb)
LexKix.cxx
(3.2 Kb)
0
LexKix.cxx
(3.2 Kb)
(4.7 Kb)
15
(7.7 Kb)
LexLout.cxx
(5.7 Kb)
0
LexLout.cxx
(5.7 Kb)
(9.6 Kb)
21
(10.3 Kb)
LexMatlab.cxx
(6.8 Kb)
0
LexMatlab.cxx
(6.8 Kb)
(8.4 Kb)
1
(8.4 Kb)
LexMMIXAL.cxx
(5.1 Kb)
0
LexMMIXAL.cxx
(5.1 Kb)
LexMPT.cxx
(4.8 Kb)
0
LexMPT.cxx
(4.8 Kb)
(10.1 Kb)
6
(11 Kb)
(13.2 Kb)
45
(17.8 Kb)
(25.2 Kb)
73
(37.6 Kb)
LexPascal.cxx
(10.3 Kb)
0
LexPascal.cxx
(10.3 Kb)
LexPB.cxx
(12.1 Kb)
0
LexPB.cxx
(12.1 Kb)
(28.4 Kb)
66
(40.3 Kb)
(9.1 Kb)
9
(9.1 Kb)
(12.6 Kb)
1
(12.6 Kb)
(13.9 Kb)
6
(14.1 Kb)
 
LexRebol.cxx
(10.3 Kb)
(10.6 Kb)
53
(52.6 Kb)
LexScriptol.cxx
(12.3 Kb)
0
LexScriptol.cxx
(12.3 Kb)
 
LexSmalltalk.cxx
(8.6 Kb)
LexSpecman.cxx
(8.6 Kb)
0
LexSpecman.cxx
(8.6 Kb)
(5.3 Kb)
27
(10.6 Kb)
 
LexTADS3.cxx
(21.4 Kb)
(7.9 Kb)
1
(7.9 Kb)
(6.8 Kb)
18
(8.3 Kb)
LexVerilog.cxx
(9.8 Kb)
0
LexVerilog.cxx
(9.8 Kb)
LexVHDL.cxx
(16 Kb)
0
LexVHDL.cxx
(16 Kb)
LexYAML.cxx
(10.1 Kb)
0
LexYAML.cxx
(10.1 Kb)
(10.4 Kb)
2
(10.5 Kb)
LineMarker.h
(1.2 Kb)
0
LineMarker.h
(1.2 Kb)
(27 Kb)
21
(28.8 Kb)
RESearch.cxx
(19.8 Kb)
0
RESearch.cxx
(19.8 Kb)
(1.3 Kb)
1
(1.3 Kb)
(15.4 Kb)
24
(17.2 Kb)
(2.4 Kb)
1
(2.5 Kb)
Style.cxx
(4.2 Kb)
0
Style.cxx
(4.2 Kb)
Style.h
(1.4 Kb)
0
Style.h
(1.4 Kb)
StyleContext.cxx
(1.1 Kb)
0
StyleContext.cxx
(1.1 Kb)
(4 Kb)
3
(4.1 Kb)
SVector.h
(2.6 Kb)
0
SVector.h
(2.6 Kb)
UniConversion.cxx
(2.1 Kb)
0
UniConversion.cxx
(2.1 Kb)
UniConversion.h
(582 Bytes)
0
UniConversion.h
(582 Bytes)
ViewStyle.cxx
(8.7 Kb)
0
ViewStyle.cxx
(8.7 Kb)
ViewStyle.h
(2.5 Kb)
0
ViewStyle.h
(2.5 Kb)
WindowAccessor.cxx
(4.6 Kb)
0
WindowAccessor.cxx
(4.6 Kb)
(6.8 Kb)
2
(6.9 Kb)
XPM.h
(1.9 Kb)
0
XPM.h
(1.9 Kb)
(29.6 Kb)
15
(30.5 Kb)
(5.5 Kb)
5
(5.6 Kb)
(95.4 Kb)
12
(99.1 Kb)
stc_cw.h
(74 Bytes)
0
stc_cw.h
(74 Bytes)
stc_cw_d.h
(76 Bytes)
0
stc_cw_d.h
(76 Bytes)
stc_cwc.h
(75 Bytes)
0
stc_cwc.h
(75 Bytes)
stc_cwc_d.h
(77 Bytes)
0
stc_cwc_d.h
(77 Bytes)
(157.9 Kb)
1
(157.9 Kb)
stcM8.xml
(451.2 Kb)
0
stcM8.xml
(451.2 Kb)
svg
1
svg
dcsvg.cpp
(23.2 Kb)
0
dcsvg.cpp
(23.2 Kb)
(15.4 Kb)
12
(15.8 Kb)
README.TXT
(1.1 Kb)
 
README.TXT
(1.1 Kb)

   Comparison Options  

DepthAll folders are compared recursively
Size-based criteriaDifferent file sizes mean different files
Equal file sizes mean equal files
Date-based criteriaDifferent dates mean different files
Equal dates mean equal files
(Only if sizes are equal)
File system precisionCompensate file system precision loss
Fixed difference (60 minutes)

Filters Options

File Name Filters
Exclude patterns*.txt;deprecated\

File Status Filters
Hide files or folders missingin left hierarchy
in right hierarchy
Other hidden itemsSystem hidden files and folders
Identical folders with no content shown

No file date filter

Display Options

Show file sizeyes
Show file dateyes
Show changes countyes

   Legend  

Unchanged lineExample of unchanged line
Modified lineExample of modified line
Conflicting lineExample of conflicting 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:02.001 +0200.
© 2005-2006 Ellié Computing http://www.elliecomputing.com. All rights reserved.