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 [C]
71
src [C]
animate [C]
2
animate [C]
(16.3 Kb)
24
(16 Kb)
(16 Kb)
12
(16.4 Kb)
readme.txt [I]
(1.3 Kb)
 
readme.txt [I]
(1.3 Kb)
applet [U]
0
applet [U]
applet.cpp [U]
(2.7 Kb)
0
applet.cpp [U]
(2.7 Kb)
appletwindow.cpp [U]
(26.9 Kb)
0
appletwindow.cpp [U]
(26.9 Kb)
echovar.cpp [U]
(7.5 Kb)
0
echovar.cpp [U]
(7.5 Kb)
ifelsevar.cpp [U]
(7.9 Kb)
0
ifelsevar.cpp [U]
(7.9 Kb)
loadpage.cpp [U]
(2.3 Kb)
0
loadpage.cpp [U]
(2.3 Kb)
makefile [U]
(889 Bytes)
0
makefile [U]
(889 Bytes)
Makefile.in [I]
(561 Bytes)
 
[I]
plugin.cpp [U]
(2.1 Kb)
0
plugin.cpp [U]
(2.1 Kb)
prepecho.cpp [U]
(4 Kb)
0
prepecho.cpp [U]
(4 Kb)
prepifelse.cpp [U]
(14.5 Kb)
0
prepifelse.cpp [U]
(14.5 Kb)
prepinclude.cpp [U]
(5.3 Kb)
0
prepinclude.cpp [U]
(5.3 Kb)
deprecated [I]
13
deprecated [I]
fl [C]
3
fl [C]
antiflickpl.cpp [U]
(6.1 Kb)
0
antiflickpl.cpp [U]
(6.1 Kb)
bardragpl.cpp [U]
(26 Kb)
0
bardragpl.cpp [U]
(26 Kb)
barhintspl.cpp [U]
(14.6 Kb)
0
barhintspl.cpp [U]
(14.6 Kb)
cbcustom.cpp [U]
(5.3 Kb)
0
cbcustom.cpp [U]
(5.3 Kb)
(81.7 Kb)
3
(81.4 Kb)
dyntbar.cpp [U]
(16.5 Kb)
0
dyntbar.cpp [U]
(16.5 Kb)
dyntbarhnd.cpp [U]
(1.3 Kb)
0
dyntbarhnd.cpp [U]
(1.3 Kb)
files.lst [U]
(439 Bytes)
0
files.lst [U]
(439 Bytes)
frmview.cpp [U]
(9.1 Kb)
0
frmview.cpp [U]
(9.1 Kb)
garbagec.cpp [U]
(4.5 Kb)
0
garbagec.cpp [U]
(4.5 Kb)
gcupdatesmgr.cpp [U]
(11 Kb)
0
gcupdatesmgr.cpp [U]
(11 Kb)
hintanimpl.cpp [U]
(10.5 Kb)
0
hintanimpl.cpp [U]
(10.5 Kb)
(20 Kb)
12
(20.4 Kb)
(22.2 Kb)
6
(22.4 Kb)
panedrawpl.cpp [U]
(36.8 Kb)
0
panedrawpl.cpp [U]
(36.8 Kb)
rowdragpl.cpp [U]
(38.4 Kb)
0
rowdragpl.cpp [U]
(38.4 Kb)
rowlayoutpl.cpp [U]
(29.2 Kb)
0
rowlayoutpl.cpp [U]
(29.2 Kb)
toolwnd.cpp [U]
(26.7 Kb)
0
toolwnd.cpp [U]
(26.7 Kb)
updatesmgr.cpp [U]
(7.8 Kb)
0
updatesmgr.cpp [U]
(7.8 Kb)
foldbar [C]
1
foldbar [C]
captionbar.cpp [U]
(12.2 Kb)
0
captionbar.cpp [U]
(12.2 Kb)
foldpanelbar.cpp [U]
(10 Kb)
0
foldpanelbar.cpp [U]
(10 Kb)
foldpanelitem.cpp [U]
(6.9 Kb)
0
foldpanelitem.cpp [U]
(6.9 Kb)
icon_collapsed.old.xpm [U]
(421 Bytes)
0
icon_collapsed.old.xpm [U]
(421 Bytes)
icon_collapsed.xpm [U]
(910 Bytes)
0
icon_collapsed.xpm [U]
(910 Bytes)
icon_expanded.old.xpm [U]
(420 Bytes)
0
icon_expanded.old.xpm [U]
(420 Bytes)
icon_expanded.xpm [U]
(909 Bytes)
0
icon_expanded.xpm [U]
(909 Bytes)
icon_theresmore.xpm [U]
(521 Bytes)
0
icon_theresmore.xpm [U]
(521 Bytes)
(16.8 Kb)
12
(17.1 Kb)
gizmos [C]
1
gizmos [C]
dynamicsash.cpp [U]
(42.5 Kb)
0
dynamicsash.cpp [U]
(42.5 Kb)
editlbox.cpp [U]
(8.4 Kb)
0
editlbox.cpp [U]
(8.4 Kb)
eldel.xpm [U]
(416 Bytes)
0
eldel.xpm [U]
(416 Bytes)
eldown.xpm [U]
(402 Bytes)
0
eldown.xpm [U]
(402 Bytes)
eledit.xpm [U]
(417 Bytes)
0
eledit.xpm [U]
(417 Bytes)
elnew.xpm [U]
(446 Bytes)
0
elnew.xpm [U]
(446 Bytes)
elup.xpm [U]
(400 Bytes)
0
elup.xpm [U]
(400 Bytes)
ledctrl.cpp [U]
(11.1 Kb)
0
ledctrl.cpp [U]
(11.1 Kb)
(27.8 Kb)
16
(28.4 Kb)
multicell.cpp [U]
(21.6 Kb)
0
multicell.cpp [U]
(21.6 Kb)
splittree.cpp [U]
(21.4 Kb)
0
splittree.cpp [U]
(21.4 Kb)
statpict.cpp [U]
(3.7 Kb)
0
statpict.cpp [U]
(3.7 Kb)
xh_statpict.cpp [U]
(1.5 Kb)
0
xh_statpict.cpp [U]
(1.5 Kb)
Makefile.in [U]
(471 Bytes)
0
Makefile.in [U]
(471 Bytes)
mmedia [C]
1
mmedia [C]
cdbase.cpp [U]
(1.6 Kb)
0
cdbase.cpp [U]
(1.6 Kb)
cdunix.cpp [U]
(5.3 Kb)
0
cdunix.cpp [U]
(5.3 Kb)
cdwin.cpp [U]
(5.8 Kb)
0
cdwin.cpp [U]
(5.8 Kb)
g711.cpp [U]
(9 Kb)
0
g711.cpp [U]
(9 Kb)
g721.cpp [U]
(5.7 Kb)
0
g721.cpp [U]
(5.7 Kb)
g723_24.cpp [U]
(5 Kb)
0
g723_24.cpp [U]
(5 Kb)
g723_40.cpp [U]
(6 Kb)
0
g723_40.cpp [U]
(6 Kb)
g72x.cpp [U]
(17.4 Kb)
0
g72x.cpp [U]
(17.4 Kb)
(23.3 Kb)
12
(23.7 Kb)
sndaiff.cpp [U]
(5.8 Kb)
0
sndaiff.cpp [U]
(5.8 Kb)
sndbase.cpp [U]
(3.9 Kb)
0
sndbase.cpp [U]
(3.9 Kb)
sndcodec.cpp [U]
(991 Bytes)
0
sndcodec.cpp [U]
(991 Bytes)
sndcpcm.cpp [U]
(12.4 Kb)
0
sndcpcm.cpp [U]
(12.4 Kb)
sndesd.cpp [U]
(9.1 Kb)
0
sndesd.cpp [U]
(9.1 Kb)
sndfile.cpp [U]
(11 Kb)
0
sndfile.cpp [U]
(11 Kb)
sndg72x.cpp [U]
(7.8 Kb)
0
sndg72x.cpp [U]
(7.8 Kb)
sndmsad.cpp [U]
(9.6 Kb)
0
sndmsad.cpp [U]
(9.6 Kb)
sndoss.cpp [U]
(8.9 Kb)
0
sndoss.cpp [U]
(8.9 Kb)
sndpcm.cpp [U]
(2.1 Kb)
0
sndpcm.cpp [U]
(2.1 Kb)
sndulaw.cpp [U]
(4.3 Kb)
0
sndulaw.cpp [U]
(4.3 Kb)
sndwav.cpp [U]
(11.8 Kb)
0
sndwav.cpp [U]
(11.8 Kb)
sndwin.cpp [U]
(23.2 Kb)
0
sndwin.cpp [U]
(23.2 Kb)
vidbase.cpp [U]
(1.5 Kb)
0
vidbase.cpp [U]
(1.5 Kb)
vidwin.cpp [U]
(5.6 Kb)
0
vidwin.cpp [U]
(5.6 Kb)
vidxanm.cpp [U]
(11.9 Kb)
0
vidxanm.cpp [U]
(11.9 Kb)
net [C]
1
net [C]
email.cpp [U]
(2.9 Kb)
0
email.cpp [U]
(2.9 Kb)
(16.7 Kb)
12
(17.1 Kb)
smapi.cpp [U]
(15.6 Kb)
0
smapi.cpp [U]
(15.6 Kb)
web.cpp [U]
(700 Bytes)
0
web.cpp [U]
(700 Bytes)
ogl [C]
1
ogl [C]
basic.cpp [U]
(86.9 Kb)
0
basic.cpp [U]
(86.9 Kb)
basic2.cpp [U]
(52.2 Kb)
0
basic2.cpp [U]
(52.2 Kb)
bmpshape.cpp [U]
(2.3 Kb)
0
bmpshape.cpp [U]
(2.3 Kb)
canvas.cpp [U]
(15.3 Kb)
0
canvas.cpp [U]
(15.3 Kb)
composit.cpp [U]
(47.7 Kb)
0
composit.cpp [U]
(47.7 Kb)
constrnt.cpp [U]
(17.7 Kb)
0
constrnt.cpp [U]
(17.7 Kb)
divided.cpp [U]
(19.3 Kb)
0
divided.cpp [U]
(19.3 Kb)
drawn.cpp [U]
(63.1 Kb)
0
drawn.cpp [U]
(63.1 Kb)
lines.cpp [U]
(68.6 Kb)
0
lines.cpp [U]
(68.6 Kb)
(18.5 Kb)
12
(18.9 Kb)
mfutils.cpp [U]
(30.7 Kb)
0
mfutils.cpp [U]
(30.7 Kb)
ogldiag.cpp [U]
(18.8 Kb)
0
ogldiag.cpp [U]
(18.8 Kb)
oglmisc.cpp [U]
(21.7 Kb)
0
oglmisc.cpp [U]
(21.7 Kb)
plot [C]
1
plot [C]
(15.7 Kb)
12
(16.1 Kb)
plot.cpp [U]
(32.1 Kb)
0
plot.cpp [U]
(32.1 Kb)
stc [C]
59
stc [C]
(35.5 Kb)
32
(38.1 Kb)
(35 Kb)
24
(35.9 Kb)
PlatWX.h [U]
(146 Bytes)
0
PlatWX.h [U]
(146 Bytes)
README.txt [I]
(2.4 Kb)
 
README.txt [I]
(2.4 Kb)
scintilla [C]
53
scintilla [C]
include [C]
7
include [C]
Accessor.h [U]
(2.5 Kb)
0
Accessor.h [U]
(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 [U]
(1.7 Kb)
0
WindowAccessor.h [U]
(1.7 Kb)
README.txt [I]
(294 Bytes)
 
README.txt [I]
(294 Bytes)
src [C]
46
src [C]
(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 [U]
(6.4 Kb)
0
ContractionState.cxx [U]
(6.4 Kb)
ContractionState.h [U]
(1.4 Kb)
0
ContractionState.h [U]
(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 [U]
(5.7 Kb)
0
ExternalLexer.cxx [U]
(5.7 Kb)
ExternalLexer.h [U]
(2.6 Kb)
0
ExternalLexer.h [U]
(2.6 Kb)
Indicator.cxx [U]
(1.9 Kb)
0
Indicator.cxx [U]
(1.9 Kb)
Indicator.h [U]
(567 Bytes)
0
Indicator.h [U]
(567 Bytes)
(4.8 Kb)
1
(4.8 Kb)
KeyMap.h [U]
(890 Bytes)
0
KeyMap.h [U]
(890 Bytes)
(4.7 Kb)
30
(5 Kb)
LexAda.cxx [U]
(11.6 Kb)
0
LexAda.cxx [U]
(11.6 Kb)
LexAPDL.cxx [U]
(4.1 Kb)
0
LexAPDL.cxx [U]
(4.1 Kb)
LexAsm.cxx [U]
(5 Kb)
0
LexAsm.cxx [U]
(5 Kb)
(5 Kb)
1
(5 Kb)
(20 Kb)
30
(27 Kb)
(6.2 Kb)
2
(6.4 Kb)
LexBaan.cxx [U]
(5.6 Kb)
0
LexBaan.cxx [U]
(5.6 Kb)
(17.8 Kb)
8
(18.5 Kb)
[I]
 
LexBasic.cxx [I]
(10 Kb)
LexBullant.cxx [U]
(6.1 Kb)
0
LexBullant.cxx [U]
(6.1 Kb)
[I]
 
LexCaml.cxx [I]
(12.2 Kb)
(13.8 Kb)
57
(21.4 Kb)
LexConf.cxx [U]
(5.3 Kb)
0
LexConf.cxx [U]
(5.3 Kb)
(12.2 Kb)
30
(13.8 Kb)
LexCrontab.cxx [U]
(6.8 Kb)
0
LexCrontab.cxx [U]
(6.8 Kb)
[I]
 
LexCsound.cxx [I]
(6 Kb)
(8.4 Kb)
4
(9.5 Kb)
(7.2 Kb)
1
(7.2 Kb)
LexErlang.cxx [U]
(16.2 Kb)
0
LexErlang.cxx [U]
(16.2 Kb)
LexEScript.cxx [U]
(7.8 Kb)
0
LexEScript.cxx [U]
(7.8 Kb)
[I]
 
LexFlagship.cxx [I]
(6.6 Kb)
LexForth.cxx [U]
(11.6 Kb)
0
LexForth.cxx [U]
(11.6 Kb)
(15.2 Kb)
2
(15.2 Kb)
(8.6 Kb)
1
(8.6 Kb)
[I]
 
LexHaskell.cxx [I]
(7.3 Kb)
(58.3 Kb)
29
(60.6 Kb)
LexKix.cxx [U]
(3.2 Kb)
0
LexKix.cxx [U]
(3.2 Kb)
(4.7 Kb)
15
(7.7 Kb)
LexLout.cxx [U]
(5.7 Kb)
0
LexLout.cxx [U]
(5.7 Kb)
(9.6 Kb)
21
(10.3 Kb)
LexMatlab.cxx [U]
(6.8 Kb)
0
LexMatlab.cxx [U]
(6.8 Kb)
(8.4 Kb)
1
(8.4 Kb)
LexMMIXAL.cxx [U]
(5.1 Kb)
0
LexMMIXA