OSDN Git Service

Merge from rev.7128:7151
authorsdottaka <none@none>
Sun, 23 May 2010 12:58:54 +0000 (21:58 +0900)
committersdottaka <none@none>
Sun, 23 May 2010 12:58:54 +0000 (21:58 +0900)
commitac87191e8ae51b6b14bafc080215905b954573af
treef69d4d1440919206c1c3c41f7b3fd93dcfb2a3c6
parent8d7c9048ce7b1e3d625bff797a166dd0538e2971
parent920aa0ce184ba0f55617d758027f764d108bba7c
Merge from rev.7128:7151
36 files changed:
ArchiveSupport/Merge7z/Merge7z453.cpp
ArchiveSupport/Merge7z/Merge7z457.dsp
ArchiveSupport/Merge7z/Merge7z457.dsw
ArchiveSupport/Merge7z/Merge7z458.dsp
ArchiveSupport/Merge7z/Merge7z465.dsp
ArchiveSupport/Merge7z/Merge7z465X64.vcproj
ArchiveSupport/Merge7z/Merge7zCommon.cpp
ArchiveSupport/Merge7z/Merge7zCommon.h
ArchiveSupport/Merge7z/Merge7zCommon453.cpp
ArchiveSupport/Merge7z/Merge7zCommon453.h
ArchiveSupport/Merge7z/readme.txt
ArchiveSupport/Merge7z/revision.txt
ArchiveSupport/Merge7z/revision453.txt
ArchiveSupport/Merge7zInstaller/Files.rc2
ArchiveSupport/Merge7zInstaller/Installer.cpp
ArchiveSupport/Merge7zInstaller/Installer.rc
Installer/InnoSetup/WinMerge.iss
Src/7zCommon.cpp
Src/AnsiConvert.cpp
Src/Common/UnicodeString.cpp
Src/Common/coretools.cpp
Src/CompareEngines/TimeSizeCompare.cpp
Src/DiffFileData.cpp
Src/FileTextEncoding.cpp
Src/FileTextEncoding.h
Src/FilterList.cpp
Src/HexMergeDoc.cpp
Src/HexMergeDoc.h
Src/HexMergeFrm.cpp
Src/HexMergeFrm.h
Src/HexMergeView.cpp
Src/MergeDiffDetailView.cpp
Src/MergeEditView.cpp
Src/codepage_detect.cpp
Src/stringdiffs.cpp
Translations/WinMerge/English.pot