OSDN Git Service

Merge with stable
authorsdottaka <sdottaka@users.sourceforge.net>
Fri, 20 Feb 2015 10:32:10 +0000 (19:32 +0900)
committersdottaka <sdottaka@users.sourceforge.net>
Fri, 20 Feb 2015 10:32:10 +0000 (19:32 +0900)
commitcc3b8114c0ee201f8d92b12aa784404bcef98154
tree65ae5138634eca74ae0bd03632e5588409fbd936
parent2fbecaec7483ba7a0ec454504b4675228ad37ad3
parent412419b6b1134adbea2817a00591592ee83f8829
Merge with stable
132 files changed:
Src/7zCommon.cpp
Src/AboutDlg.cpp
Src/AboutDlg.h
Src/CCPromptDlg.cpp
Src/CCPromptDlg.h
Src/ChildFrm.cpp
Src/Common/ClipBoard.h
Src/Common/LanguageSelect.cpp
Src/Common/LanguageSelect.h
Src/Common/MDITabBar.cpp
Src/Common/PreferencesDlg.cpp
Src/Common/PreferencesDlg.h
Src/Common/RegKey.cpp
Src/Common/ShellFileOperations.h
Src/Common/UnicodeString.cpp
Src/Common/UnicodeString.h
Src/Common/unicoder.cpp
Src/ConfirmFolderCopyDlg.cpp
Src/ConfirmFolderCopyDlg.h
Src/Constants.h
Src/DiffItem.h
Src/DiffList.cpp
Src/DiffViewBar.cpp
Src/DirActions.cpp
Src/DirCmpReport.cpp
Src/DirCmpReportDlg.cpp
Src/DirCmpReportDlg.h
Src/DirColsDlg.cpp
Src/DirColsDlg.h
Src/DirDoc.cpp
Src/DirDoc.h
Src/DirFrame.cpp
Src/DirItem.cpp
Src/DirTravel.cpp
Src/DirView.cpp
Src/DirView.h
Src/DirViewColItems.cpp
Src/DirViewColItems.h
Src/EditorFilepathBar.cpp
Src/EditorFilepathBar.h
Src/Environment.cpp
Src/FileActionScript.cpp
Src/FileActionScript.h
Src/FileFilterHelper.cpp
Src/FileFiltersDlg.cpp
Src/FileFiltersDlg.h
Src/FileOrFolderSelect.cpp
Src/FileOrFolderSelect.h
Src/FileTextEncoding.cpp
Src/FileTransform.h
Src/FilepathEdit.cpp
Src/FilepathEdit.h
Src/HexMergeDoc.cpp
Src/HexMergeFrm.cpp
Src/HexMergeView.cpp
Src/IListCtrl.h
Src/IListCtrlImpl.h
Src/ImgMergeFrm.cpp
Src/LineFiltersDlg.cpp
Src/LineFiltersDlg.h
Src/LoadSaveCodepageDlg.cpp
Src/LoadSaveCodepageDlg.h
Src/LocationBar.cpp
Src/LocationView.cpp
Src/MainFrm.cpp
Src/MainFrm.h
Src/Merge.cpp
Src/Merge.h
Src/Merge.vcxproj
Src/Merge.vcxproj.filters
Src/MergeApp.h
Src/MergeCmdLineInfo.cpp
Src/MergeDoc.cpp
Src/MergeDocLineDiffs.cpp
Src/MergeEditView.cpp
Src/MergeEditView.h
Src/OpenView.cpp
Src/OptionsDef.h
Src/OptionsInit.cpp
Src/PatchDlg.cpp
Src/PatchDlg.h
Src/PatchTool.cpp
Src/PatchTool.h
Src/PathContext.cpp
Src/PluginManager.h
Src/Plugins.cpp
Src/PluginsListDlg.cpp
Src/PluginsListDlg.h
Src/ProjectFilePathsDlg.cpp
Src/ProjectFilePathsDlg.h
Src/PropArchive.cpp
Src/PropArchive.h
Src/PropBackups.cpp
Src/PropBackups.h
Src/PropCodepage.cpp
Src/PropCodepage.h
Src/PropCompare.cpp
Src/PropCompare.h
Src/PropCompareFolder.cpp
Src/PropCompareFolder.h
Src/PropEditor.cpp
Src/PropEditor.h
Src/PropGeneral.cpp
Src/PropGeneral.h
Src/PropRegistry.cpp
Src/PropRegistry.h
Src/PropShell.cpp
Src/PropShell.h
Src/PropTextColors.cpp
Src/PropTextColors.h
Src/PropVss.cpp
Src/PropVss.h
Src/SaveClosingDlg.cpp
Src/SaveClosingDlg.h
Src/SelectUnpackerDlg.cpp
Src/SelectUnpackerDlg.h
Src/SharedFilterDlg.cpp
Src/SourceControl.cpp
Src/StdAfx.cpp
Src/StdAfx.h
Src/TempFile.cpp
Src/TestFilterDlg.cpp
Src/TestFilterDlg.h
Src/VSSHelper.cpp
Src/VssPromptDlg.cpp
Src/VssPromptDlg.h
Src/WMGotoDlg.cpp
Src/WMGotoDlg.h
Src/WaitStatusCursor.cpp
Src/WaitStatusCursor.h
Src/paths.cpp
Src/paths.h