This repository was archived by the owner on Apr 20, 2020. It is now read-only.
Commit 441c91f
committed
代码升级到3.63。采用合并官方仓库模式。
Merge branch 'changetoM' of github.com:Mapaler/FastCopy
# Conflicts:
# FastCopy.sln
# FastCopy.vcxproj
# doc/readme_eng.txt
# doc/readme_ja.txt
# external/xxhash/xxhash.vcxproj
# external/zlib/zlib.def
# external/zlib/zlib.vcxproj
# external/zlib/zlib1.rc
# help/fastcopy.hhc
# help/fastcopy.hhk
# help/fastcopy.hhp
# help/fastcopy.htm
# help/fastcopy_eng.htm
# src/TLib/TLib.vcxproj
# src/TLib/ipdict.cpp
# src/TLib/ipdict.h
# src/TLib/scopeexit.h
# src/TLib/tads.cpp
# src/TLib/tapi32ex.cpp
# src/TLib/tapi32ex.h
# src/TLib/tapi32u8.cpp
# src/TLib/tapi32u8.h
# src/TLib/tapp.cpp
# src/TLib/tcmndlg.cpp
# src/TLib/tcmndlg.h
# src/TLib/tdlg.cpp
# src/TLib/texcept.cpp
# src/TLib/texcept.h
# src/TLib/tgdiplus.cpp
# src/TLib/tgdiplus.h
# src/TLib/tinet.cpp
# src/TLib/tinet.h
# src/TLib/tini.cpp
# src/TLib/tlib.h
# src/TLib/tmisc.cpp
# src/TLib/tmisc.h
# src/TLib/tregist.cpp
# src/TLib/tstr.cpp
# src/TLib/tstr.h
# src/TLib/twin.cpp
# src/cfg.cpp
# src/cfg.h
# src/fastcopy.cpp
# src/fastcopy.exe.manifest
# src/fastcopy.h
# src/fastcopy.rc
# src/fastcopyd.cpp
# src/fastcopyr.cpp
# src/fastcopyw.cpp
# src/install/install.cpp
# src/install/install.h
# src/install/install.rc
# src/install/install.vcxproj
# src/install/resource.h
# src/install/setup.exe.manifest
# src/mainwin.cpp
# src/mainwin.h
# src/mainwinev.cpp
# src/mainwinlog.cpp
# src/mainwinopt.cpp
# src/mainwinopt.h
# src/mainwinupd.cpp
# src/miscdlg.cpp
# src/miscdlg.h
# src/regexp.cpp
# src/regexp.h
# src/res/fcdone.ico
# src/res/fcerr.ico
# src/res/fcwait.ico
# src/res/icon1.ico
# src/res/icon3.ico
# src/res/icon4.ico
# src/resource.h
# src/setupdlg.cpp
# src/setupdlg.h
# src/shareinfo.cpp
# src/shareinfo.h
# src/shellext/FastEx64.dll.manifest
# src/shellext/fcshext.ico
# src/shellext/shell64.def
# src/shellext/shelldef.h
# src/shellext/shellext.cpp
# src/shellext/shellext.def
# src/shellext/shellext.h
# src/shellext/shellext.rc
# src/shellext/shellext.vcxproj
# src/tlib_env.h
# src/utility.cpp
# src/utility.h
# src/version.cpp
# src/version.h25 files changed
Lines changed: 296 additions & 194 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | | - | |
| 2 | + | |
3 | 3 | | |
4 | 4 | | |
5 | 5 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | | - | |
| 2 | + | |
3 | 3 | | |
4 | 4 | | |
5 | 5 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | | - | |
| 2 | + | |
3 | 3 | | |
4 | 4 | | |
5 | 5 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1 | 1 | | |
2 | | - | |
| 2 | + | |
3 | 3 | | |
4 | 4 | | |
5 | 5 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
87 | 87 | | |
88 | 88 | | |
89 | 89 | | |
90 | | - | |
| 90 | + | |
91 | 91 | | |
92 | 92 | | |
93 | 93 | | |
94 | | - | |
| 94 | + | |
95 | 95 | | |
96 | 96 | | |
97 | 97 | | |
| |||
887 | 887 | | |
888 | 888 | | |
889 | 889 | | |
| 890 | + | |
| 891 | + | |
| 892 | + | |
| 893 | + | |
| 894 | + | |
890 | 895 | | |
891 | 896 | | |
892 | 897 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
76 | 76 | | |
77 | 77 | | |
78 | 78 | | |
79 | | - | |
| 79 | + | |
80 | 80 | | |
81 | 81 | | |
82 | 82 | | |
83 | | - | |
| 83 | + | |
84 | 84 | | |
85 | 85 | | |
86 | 86 | | |
| |||
892 | 892 | | |
893 | 893 | | |
894 | 894 | | |
| 895 | + | |
| 896 | + | |
| 897 | + | |
| 898 | + | |
| 899 | + | |
895 | 900 | | |
896 | 901 | | |
897 | 902 | | |
| |||
0 commit comments