git.osdn.net Git - winmerge-jp/winmerge-jp.git/history

(root) / winmerge-jp / winmerge-jp.git / history

[winmerge-jp/winmerge-jp.git] / Src / Merge.h

2023-02-19	Takashi Sawanaka	Add -show-dialog and -show-compare-as-menu command...	blob \| commitdiff
2023-02-18	Takashi Sawanaka	Add -show-dialog and -show-compare-as-menu command...	blob \| commitdiff \| diff to current
2022-09-13	Takashi Sawanaka	PR #1481 (5)	blob \| commitdiff \| diff to current
2022-09-12	Takashi Sawanaka	PR #1481 (4)	blob \| commitdiff \| diff to current
2022-09-12	Srdzank	The feature will allow the user to right-click the...	blob \| commitdiff \| diff to current
2021-08-15	Takashi Sawanaka	Add /EnableExitCode command line switch	blob \| commitdiff \| diff to current
2021-08-12	Takashi Sawanaka	Don't load file filters until they are used	blob \| commitdiff \| diff to current
2021-08-01	Takashi Sawanaka	Make CreateOptionsManager() function static function	blob \| commitdiff \| diff to current
2021-07-25	Takashi Sawanaka	Add CMergeApp::GetLangName() function	blob \| commitdiff \| diff to current
2021-06-20	Takashi Sawanaka	Improve plugin system (#797)	blob \| commitdiff \| diff to current
2021-05-16	Takashi Sawanaka	Make Unpacker plugins available for image compare and...	blob \| commitdiff \| diff to current
2021-04-29	grzesie	Possibility to store settings in INI file (#248) (...	blob \| commitdiff \| diff to current
2021-04-21	Takashi Sawanaka	refactor	blob \| commitdiff \| diff to current
2021-04-20	Takashi Sawanaka	refactor	blob \| commitdiff \| diff to current
2021-04-20	Takashi Sawanaka	Add "Open Parent Folder" menu item to the file compare...	blob \| commitdiff \| diff to current
2021-03-16	Takashi Sawanaka	Disable loading of the language resource DLL for faster...	blob \| commitdiff \| diff to current
2021-01-27	Takashi Sawanaka	Rename "Ignored Substitutions" to "Substitution Filters"	blob \| commitdiff \| diff to current
2021-01-26	Takashi Sawanaka	A new feature "Ignored Substitutions" (2) (#560)	blob \| commitdiff \| diff to current
2021-01-10	Takashi Sawanaka	Merge remote-tracking branch 'origin/stable'	blob \| commitdiff \| diff to current
2021-01-10	Takashi Sawanaka	Merge remote-tracking branch 'origin/stable'	blob \| commitdiff \| diff to current
2021-01-10	Takashi Sawanaka	Merge branch 'stable' of c:\dev\winmerge-stable	blob \| commitdiff \| diff to current
2021-01-08	Takashi Sawanaka	Merge pull request #545 from GreyMerlin/master	blob \| commitdiff \| diff to current
2021-01-08	EugeneLaptev	Added a new feature "Ignored Substitutions", which...	blob \| commitdiff \| diff to current
2021-01-08	EugeneSumo	Added a new feature "Ignored Substitutions", which...	blob \| commitdiff \| diff to current
2020-11-01	Takashi Sawanaka	Syntax-highlighter-based comment filter (Fix osdn.net...	blob \| commitdiff \| diff to current
2020-10-17	LMS	Merge pull request #8 from WinMerge/master	blob \| commitdiff \| diff to current
2020-09-16	Takashi Sawanaka	Make the toolbar icon DPI-aware. fixes #370, fixes...	blob \| commitdiff \| diff to current
2020-09-08	Takashi Sawanaka	Merge branch 'master' into master	blob \| commitdiff \| diff to current
2020-08-27	LMS	Merge pull request #7 from WinMerge/master	blob \| commitdiff \| diff to current
2020-08-12	Takashi Sawanaka	Test solution configuration: Reduce test time (77s...	blob \| commitdiff \| diff to current
2020-07-28	Takashi Sawanaka	Merge branch 'master' into master	blob \| commitdiff \| diff to current
2020-05-20	LMS	Merge pull request #5 from WinMerge/master	blob \| commitdiff \| diff to current
2020-05-16	Takashi Sawanaka	Use SPDX license identifier	blob \| commitdiff \| diff to current
2020-01-03	Takashi Sawanaka	Merge pull request #247 from mesajflaviu/new_branch	blob \| commitdiff \| diff to current
2020-01-02	Flaviu	modifications	blob \| commitdiff \| diff to current
2019-07-04	Takashi Sawanaka	Reduce the size of the executable file (3)	blob \| commitdiff \| diff to current
2019-02-01	Takashi Sawanaka	Remove unused variables	blob \| commitdiff \| diff to current
2019-02-01	Takashi Sawanaka	Reduce application startup time by reducing the number...	blob \| commitdiff \| diff to current
2018-10-28	Takashi Sawanaka	Merge pull request #101 from GreyMerlin/master	blob \| commitdiff \| diff to current
2018-10-28	GreyMerlin	Various refactorings involving NULL, ASSERT, TRUE and...	blob \| commitdiff \| diff to current
2018-10-12	Takashi Sawanaka	Merge pull request #97 from GreyMerlin/master	blob \| commitdiff \| diff to current
2018-10-11	GreyMerlin	`BOOL` becomes `bool` and related (1)	blob \| commitdiff \| diff to current
2018-09-26	Takashi Sawanaka	Merge pull request #96 from GreyMerlin/master	blob \| commitdiff \| diff to current
2018-09-25	GreyMerlin	Merge branch 'master' of https://github.com/sdottaka...	blob \| commitdiff \| diff to current
2018-09-23	GreyMerlin	Merge branch 'master' of https://github.com/sdottaka...	blob \| commitdiff \| diff to current
2018-09-21	GreyMerlin	Eliminate old (and unfinished) Version Control feature	blob \| commitdiff \| diff to current
2018-04-26	Takashi Sawanaka	Allow short key name in -config command line option	blob \| commitdiff \| diff to current
2017-11-06	Takashi Sawanaka	Merge.cpp: Exit WinMerge after folder comparison or...	blob \| commitdiff \| diff to current
2017-10-06	Takashi Sawanaka	Merge pull request #42 from GreyMerlin/master	blob \| commitdiff \| diff to current
2017-10-04	GreyMerlin	Cleanup: Remove useless AFX_INSERT_LOCATION	blob \| commitdiff \| diff to current
2017-08-28	Takashi Sawanaka	editlib: Implement Marker feature (WIP) 2.14.0+-jp-138	blob \| commitdiff \| diff to current
2017-07-17	Takashi Sawanaka	Remove unused declarations	blob \| commitdiff \| diff to current
2016-11-19	Takashi Sawanaka	Merge	blob \| commitdiff \| diff to current
2016-05-29	Takashi Sawanaka	Add '/or reportfilename' command line option	blob \| commitdiff \| diff to current
2016-05-28	Takashi Sawanaka	Remove CMergeApp::m_strDescription used as a global...	blob \| commitdiff \| diff to current
2016-05-21	Takashi Sawanaka	Change the type of the variable CMergeApp::m_strSaveAsP...	blob \| commitdiff \| diff to current
2015-11-28	sdottaka	Merge with default	blob \| commitdiff \| diff to current
2015-11-23	sdottaka	Avoid creating FilterCommentsManager object every times...	blob \| commitdiff \| diff to current
2015-09-06	sdottaka	Merge with stable	blob \| commitdiff \| diff to current
2015-08-02	sdottaka	Merge with stable	blob \| commitdiff \| diff to current
2015-07-19	sdottaka	Merge with stable	blob \| commitdiff \| diff to current
2015-07-19	sdottaka	Merge with stable	blob \| commitdiff \| diff to current
2015-07-19	sdottaka	Remove MergeApp.h dependency from some source files	blob \| commitdiff \| diff to current
2015-07-12	sdottaka	Merge with stable	blob \| commitdiff \| diff to current
2015-06-21	sdottaka	Merge with stable	blob \| commitdiff \| diff to current
2015-06-21	sdottaka	Merge with stable	blob \| commitdiff \| diff to current
2015-05-24	sdottaka	Merge with stable	blob \| commitdiff \| diff to current
2015-05-24	sdottaka	Merge with stable	blob \| commitdiff \| diff to current
2015-05-17	sdottaka	Allow using environment variables in temporary path...	blob \| commitdiff \| diff to current
2015-05-10	sdottaka	Merge with stable	blob \| commitdiff \| diff to current
2015-05-08	sdottaka	Merge with stable	blob \| commitdiff \| diff to current
2015-05-03	sdottaka	Merge with stable	blob \| commitdiff \| diff to current
2015-04-26	sdottaka	Merge with stable	blob \| commitdiff \| diff to current
2015-04-19	sdottaka	Merge with stable	blob \| commitdiff \| diff to current
2015-03-29	sdottaka	Merge with stable	blob \| commitdiff \| diff to current
2015-03-22	sdottaka	Merge with stable	blob \| commitdiff \| diff to current
2015-03-22	sdottaka	Use appropriate system UI font for dialogs (Use Segoe...	blob \| commitdiff \| diff to current
2015-03-21	sdottaka	Merge with stable	blob \| commitdiff \| diff to current
2015-03-08	sdottaka	Merge with stable	blob \| commitdiff \| diff to current
2015-02-28	sdottaka	Merge with stable	blob \| commitdiff \| diff to current
2015-02-28	sdottaka	Merge with stable	blob \| commitdiff \| diff to current
2015-02-24	sdottaka	Merge with stable	blob \| commitdiff \| diff to current
2015-02-21	sdottaka	Merge with stable	blob \| commitdiff \| diff to current
2015-02-21	sdottaka	- Add Language combo box to PropGeneral property sheet	blob \| commitdiff \| diff to current
2015-02-20	sdottaka	Merge with stable	blob \| commitdiff \| diff to current
2015-02-18	sdottaka	- Replace include guards with #pragma once like winmerg...	blob \| commitdiff \| diff to current
2015-02-18	sdottaka	Merge with stable	blob \| commitdiff \| diff to current
2015-02-17	sdottaka	Merge with stable	blob \| commitdiff \| diff to current
2015-02-15	sdottaka	Merge with stable	blob \| commitdiff \| diff to current
2015-02-13	sdottaka	Merge with stable	blob \| commitdiff \| diff to current
2015-02-09	sdottaka	Merge with stable	blob \| commitdiff \| diff to current
2015-01-25	sdottaka	Merge with stable	blob \| commitdiff \| diff to current
2015-01-22	sdottaka	Merge with stable	blob \| commitdiff \| diff to current
2015-01-16	sdottaka	Merge with stable	blob \| commitdiff \| diff to current
2014-12-29	sdottaka	Merge with stable	blob \| commitdiff \| diff to current
2014-12-27	sdottaka	Move splash screen image to About dialog and remove...	blob \| commitdiff \| diff to current
2014-12-20	sdottaka	Merge with stable	blob \| commitdiff \| diff to current
2014-11-29	sdottaka	Merge with stable	blob \| commitdiff \| diff to current
2014-11-29	sdottaka	Merge with stable	blob \| commitdiff \| diff to current
2014-11-28	sdottaka	Use std::unique_ptr/shared_ptr instead of boost::scoped...	blob \| commitdiff \| diff to current
next

RSS Atom

About OSDN

Find Software

Develop Software

Help