OSDN Git Service

Leave the class name as CIniOptionsMgr, but rename the filename to IniOptionsMgr.*
[winmerge-jp/winmerge-jp.git] / Src / Merge.cpp
2021-04-30 Takashi SawanakaLeave the class name as CIniOptionsMgr, but rename...
2021-04-29 grzesiePossibility to store settings in INI file (#248) (...
2021-04-21 Takashi Sawanakarefactor
2021-04-20 Takashi Sawanakarefactor
2021-04-20 Takashi SawanakaAdd "Open Parent Folder" menu item to the file compare...
2021-04-10 Takashi SawanakaFix compilation warnings
2021-03-14 Takashi SawanakaMake it possible to specify the file type in the "Selec...
2021-02-28 Takashi SawanakaAdd /self-compare command line option
2021-02-12 Takashi SawanakaFix GitHub issue #622: Single instance mode does not...
2021-01-27 Takashi SawanakaRename "Ignored Substitutions" to "Substitution Filters"
2021-01-26 Takashi SawanakaA new feature "Ignored Substitutions" (2) (#560)
2021-01-10 Takashi SawanakaMerge remote-tracking branch 'origin/stable'
2021-01-10 Takashi SawanakaMerge remote-tracking branch 'origin/stable'
2021-01-10 Takashi SawanakaMerge branch 'stable' of c:\dev\winmerge-stable
2021-01-08 Takashi SawanakaMerge pull request #545 from GreyMerlin/master
2021-01-08 EugeneLaptevAdded a new feature "Ignored Substitutions", which...
2021-01-08 EugeneSumoAdded a new feature "Ignored Substitutions", which...
2021-01-05 Takashi SawanakaMerge pull request #539 from GreyMerlin/master
2021-01-04 GreyMerlinFix "LNT1000: A sub-expression may overflow before...
2021-01-02 Takashi SawanakaGitHub issue #530: [feature request] Add options to...
2020-12-12 Takashi SawanakaAdd the command line option "/s-" to ensure that anothe...
2020-11-01 Takashi SawanakaSyntax-highlighter-based comment filter (Fix osdn.net...
2020-10-26 Takashi SawanakaUpdate English.pot (2)
2020-10-17 LMSMerge pull request #8 from WinMerge/master
2020-10-10 Takashi SawanakaMerge.cpp: Avoid unnecessary drawing at startup
2020-09-16 Takashi SawanakaMake the toolbar icon DPI-aware. fixes #370, fixes...
2020-08-05 LMSMerge pull request #6 from WinMerge/master
2020-07-28 Takashi SawanakaMerge branch 'master' into master
2020-05-26 Takashi SawanakaFix a problem where tests in the "Test" configuration...
2020-05-20 LMSMerge pull request #5 from WinMerge/master
2020-05-20 Takashi SawanakaAllow a unpacker plugin to be specified with command...
2020-05-16 Takashi SawanakaUse SPDX license identifier
2020-03-29 Takashi Sawanaka- Add Solarized Dark/Light color scheme
2020-03-21 Takashi SawanakaMerge remote-tracking branch 'origin/master'
2020-03-21 Takashi SawanakaAttempt to speed up
2020-03-14 Takashi SawanakaRegOptionsMgr.*: Make writing to the registry asynchronous
2020-01-05 Takashi SawanakaMerge.cpp: Allow path starting '\' without drive name...
2019-12-14 Takashi SawanakaMerge.cpp: CMergeApp::GetProfile*():
2019-11-24 Takashi SawanakaAdd support for Color Emoji (WIP)
2019-07-04 Takashi SawanakaReduce the size of the executable file (3)
2019-06-30 Takashi SawanakaCppcheck: The scope of the variable '...' can be reduced
2019-06-29 datadiodeFavor PathContext::GetSize() over PathContext::size()
2019-06-25 Takashi SawanakaMerged in gerundt/winmerge/OwnDirColors (pull request...
2019-06-20 Takashi SawanakaReduce compilation warnings
2019-06-16 Takashi SawanakaAllow multiple <paths> in project file
2019-06-02 gandfMerge pull request #2 from WinMerge/master
2019-05-26 Takashi SawanakaFix bitbucket issue #158: Supporting relative path...
2019-04-14 Takashi SawanakaMerged in gerundt/winmerge (pull request #37)
2019-04-11 Takashi SawanakaFix GitHub issue #138: Location and Diff pane visibilit...
2019-04-06 Takashi SawanakaRename CChlidFrame class to CMergeEditFrame class
2019-03-02 Takashi SawanakaMerge.cpp: Use ATTACH_PARENT_PROCESS instead of -1
2019-03-02 Takashi SawanakaMerge.cpp: Output the message of message box to parent...
2019-02-24 Takashi SawanakaUse COptionsMgr instead of GetProfile*() and WriteProfi...
2019-02-01 Takashi SawanakaRemove WMPROFILE
2019-02-01 Takashi SawanakaReduce application startup time by reducing the number...
2018-12-23 Takashi SawanakaMerge
2018-12-23 Takashi SawanakaMerge.cpp: Show translated HTML help if exists
2018-10-28 Takashi SawanakaMerge pull request #101 from GreyMerlin/master
2018-10-28 GreyMerlinVarious refactorings involving NULL, ASSERT, TRUE and...
2018-10-28 GreyMerlinVarious refactorings involving NULL, ASSERT, TRUE and...
2018-10-28 GreyMerlinVarious refactorings involving NULL, ASSERT, TRUE and...
2018-10-28 GreyMerlinCleanup PLUGIN_MODE usage
2018-10-28 GreyMerlinVarious refactorings involving NULL, ASSERT, TRUE and...
2018-10-22 Takashi SawanakaMerge pull request #99 from GreyMerlin/master
2018-10-22 Takashi SawanakaWrite an error message to the console when unknown...
2018-10-12 Takashi SawanakaMerge pull request #97 from GreyMerlin/master
2018-10-11 GreyMerlin`BOOL` becomes `bool` and related (2)
2018-10-11 GreyMerlin`BOOL` becomes `bool` and related (1)
2018-09-26 Takashi SawanakaMerge pull request #96 from GreyMerlin/master
2018-09-25 GreyMerlinMerge branch 'master' of https://github.com/sdottaka...
2018-09-23 GreyMerlinMerge branch 'master' of https://github.com/sdottaka...
2018-09-21 GreyMerlinEliminate old (and unfinished) Version Control feature
2018-08-04 Takashi SawanakaMerge
2018-07-30 Takashi SawanakaMerge pull request #92 from GreyMerlin/master
2018-07-26 GreyMerlinReduce Level 4 Build Warnings (2)
2018-06-09 Takashi SawanakaAdd Window/Split menu item
2018-06-09 Takashi SawanakaMerge pull request #87 from GreyMerlin/master
2018-06-08 GreyMerlinVery Long Path and File Names (5)
2018-06-08 GreyMerlinVery Long Path and File Names (3)
2018-06-08 GreyMerlinVery Long Path and File Names (2)
2018-06-08 GreyMerlinVery Long Path and File Names (1)
2018-05-02 Takashi SawanakaFileOrFolderSelect.*: Move the position of frequently...
2018-04-26 Takashi SawanakaAllow short key name in -config command line option
2018-04-26 Takashi SawanakaMerge.cpp: Remove unused struct definition
2018-04-26 Takashi SawanakaMerge.cpp: cleanup
2017-11-06 Takashi Sawanaka- Make /noprefs, /ignorews, /ignoreblanklines, /ignorec...
2017-11-06 Takashi SawanakaMerge.cpp: Exit WinMerge after folder comparison or...
2017-10-06 Takashi SawanakaMerge pull request #42 from GreyMerlin/master
2017-10-04 GreyMerlinCleanup: remove all level-3 warnings
2017-09-29 Takashi SawanakaRemove Japanese help
2017-09-29 Takashi SawanakaMerge
2017-09-25 Takashi SawanakaMerged in jdunne525/winmerge-v2 (pull request #1)
2017-09-25 Takashi Sawanakaeditlib: Implement Marker feature(2)
2017-09-25 Joseph DunneMore on Issue #73 Fixed the -dl -dm and -dr description...
2017-09-20 Takashi SawanakaFix issue #73: Command line parameter /dr doesn't work...
2017-09-02 Takashi SawanakaMerge.cpp: avoid an assertion failure
2017-08-28 Takashi Sawanakaeditlib: Implement Marker feature (WIP) 2.14.0+-jp-138
2017-07-09 Takashi SawanakaMerge.cpp: To decrease startup time, call CleanupWMtemp...
2017-06-29 Takashi SawanakaAdd 'Test' configuration to test WinMerge
2017-01-05 Takashi SawanakaMerge pull request #16 from Lippe35/master
next