OSDN Git Service

Merge with stable
authorsdottaka <sdottaka@sourceforge.net>
Sat, 3 May 2014 12:50:35 +0000 (21:50 +0900)
committersdottaka <sdottaka@sourceforge.net>
Sat, 3 May 2014 12:50:35 +0000 (21:50 +0900)
commit36e458823b34a89474c73a9ff151030686aba7a8
tree9dba187a04cb1bc4c1c6c70d8297b8cb50d7c2c8
parent592f6959336dc1aebaf19002c3e04be777da84a1
parent9a2d533d72dcbcbda2c62751472c092366af45e9
Merge with stable
13 files changed:
Src/Common/UnicodeString.cpp
Src/DiffContext.cpp
Src/DiffContext.h
Src/DirScan.cpp
Src/DirTravel.cpp
Src/DirViewColItems.cpp
Src/FileFilterHelper.h
Src/FileTextEncoding.cpp
Src/FolderCmp.cpp
Src/MainFrm.cpp
Src/Merge.vcxproj
Src/Merge.vcxproj.filters
Src/codepage_detect.cpp