ToroiseGitMerge: Add dialog to set the EOL and encoding
commitb976d1970ce648abdce2650d23fcd8060cdd47a2
authorSup Yut Sum <ch3cooli@gmail.com>
Thu, 23 May 2013 12:00:20 +0000 (23 20:00 +0800)
committerSup Yut Sum <ch3cooli@gmail.com>
Thu, 23 May 2013 12:00:20 +0000 (23 20:00 +0800)
tree710af15351f8e3ef1e1e0d2b0ad55e02655710ba
parenta4b094aae291ec5ee3daa4b4b8102ced0fd925e8
ToroiseGitMerge: Add dialog to set the EOL and encoding

Signed-off-by: Sup Yut Sum <ch3cooli@gmail.com>
src/Resources/TortoiseMergeENG.rc
src/TortoiseMerge/EncodingDlg.cpp [new file with mode: 0644]
src/TortoiseMerge/EncodingDlg.h [new file with mode: 0644]
src/TortoiseMerge/MainFrm.cpp
src/TortoiseMerge/MainFrm.h
src/TortoiseMerge/TortoiseMerge.vcxproj
src/TortoiseMerge/TortoiseMerge.vcxproj.filters
src/TortoiseMerge/resource.h