OSDN Git Service
(root)
/
winmerge-jp
/
winmerge-jp.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
9865932
)
Remove WMPROFILE
author
Takashi Sawanaka
<sdottaka@users.sourceforge.net>
Fri, 1 Feb 2019 15:36:57 +0000
(
00:36
+0900)
committer
Takashi Sawanaka
<sdottaka@users.sourceforge.net>
Fri, 1 Feb 2019 15:36:57 +0000
(
00:36
+0900)
--HG--
branch : stable
Src/Merge.cpp
patch
|
blob
|
history
diff --git
a/Src/Merge.cpp
b/Src/Merge.cpp
index
759c43c
..
1b5b713
100644
(file)
--- a/
Src/Merge.cpp
+++ b/
Src/Merge.cpp
@@
-202,10
+202,7
@@
BOOL CMergeApp::InitInstance()
if (cmdInfo.m_bNoPrefs)
m_pOptions->SetSerializing(false); // Turn off serializing to registry.
- {
- WMPROFILE(L"Init");
- Options::Init(m_pOptions.get()); // Implementation in OptionsInit.cpp
- }
+ Options::Init(m_pOptions.get()); // Implementation in OptionsInit.cpp
ApplyCommandLineConfigOptions(cmdInfo);
if (cmdInfo.m_sErrorMessages.size() > 0)
{