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

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

[winmerge-jp/winmerge-jp.git] / Src / MergeDocLineDiffs.cpp

2023-03-14	Takashi Sawanaka	Use std::basic_string instead of CString	blob \| commitdiff
2023-03-10	Takashi Sawanaka	Use the CEPoint type instead of the CPoint type for...	blob \| commitdiff \| diff to current
2022-02-26	Takashi Sawanaka	Fix inline difference selection by F4 key not working...	blob \| commitdiff \| diff to current
2021-11-21	Takashi Sawanaka	Make the 'Match similar lines' option work for 3-way...	blob \| commitdiff \| diff to current
2021-11-06	Takashi Sawanaka	Improve 'Match similar lines' (related to the issue...	blob \| commitdiff \| diff to current
2021-10-28	evoc	Added option "Ignore numbers" (#1025)	blob \| commitdiff \| diff to current
2021-08-20	Takashi Sawanaka	MergeDocLineDiff.cpp: Fix crash when pressing Shift...	blob \| commitdiff \| diff to current
2021-04-18	Takashi Sawanaka	crystaledit: Use structured bindings	blob \| commitdiff \| diff to current
2021-01-28	Takashi Sawanaka	A new feature "Ignored Substitutions" (10)	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" (7)	blob \| commitdiff \| diff to current
2021-01-26	Takashi Sawanaka	A new feature "Ignored Substitutions" (6)	blob \| commitdiff \| diff to current
2021-01-26	Takashi Sawanaka	A new feature "Ignored Substitutions" (2) (#560)	blob \| commitdiff \| diff to current
2021-01-13	Takashi Sawanaka	Merge pull request #556 from gerundt/translations-status	blob \| commitdiff \| diff to current
2021-01-11	Takashi Sawanaka	Merge pull request #549 from EugeneLaptev/master	blob \| commitdiff \| diff to current
2021-01-11	EugeneSumo	Fixed the problem I introduced by a merge - a duplicate...	blob \| commitdiff \| diff to current
2021-01-11	EugeneLaptev	Merge branch 'master' into master	blob \| commitdiff \| diff to current
2021-01-11	EugeneSumo	Fixed Ignored Substitutions failing to ignore changes...	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-09	Takashi Sawanaka	GitHub issue #522: Feature: markings in all panels (2)	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-12-31	Takashi Sawanaka	GitHub issue #522: Feature: markings in all panels	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-09	Takashi Sawanaka	- Fix the problem that pressing the F4 key did not...	blob \| commitdiff \| diff to current
2020-03-21	Takashi Sawanaka	Fix an issue where EOL differences are highlighted...	blob \| commitdiff \| diff to current
2019-04-06	Takashi Sawanaka	Word-level merging did not work correctly if the number...	blob \| commitdiff \| diff to current
2019-03-31	Takashi Sawanaka	Merge	blob \| commitdiff \| diff to current
2019-03-31	Takashi Sawanaka	Change std::vector<T> output argument to return value	blob \| commitdiff \| diff to current
2019-03-30	Takashi Sawanaka	Merged in gerundt/winmerge (pull request #35)	blob \| commitdiff \| diff to current
2019-03-14	Takashi Sawanaka	word level diff dit not work if the text contains NUL...	blob \| commitdiff \| diff to current
2019-03-10	Takashi Sawanaka	Remove IF_IS_TRUE_ALL macro	blob \| commitdiff \| diff to current
2018-06-09	Takashi Sawanaka	Add Window/Split menu item	blob \| commitdiff \| diff to current
2017-05-23	Takashi Sawanaka	MergeDocLineDiffs.cpp: Avoid out of bounds access(2...	blob \| commitdiff \| diff to current
2017-05-21	Takashi Sawanaka	MergeDocLineDiffs.cpp: Avoid out of bounds access	blob \| commitdiff \| diff to current
2017-01-05	Takashi Sawanaka	Merge pull request #16 from Lippe35/master	blob \| commitdiff \| diff to current
2017-01-02	Takashi Sawanaka	Replace sd_* with strdiff::*	blob \| commitdiff \| diff to current
2016-11-19	Takashi Sawanaka	Merge	blob \| commitdiff \| diff to current
2016-08-15	Takashi Sawanaka	Cppcheck: Prefer prefix ++/-- operators for non-primiti...	blob \| commitdiff \| diff to current
2016-05-28	Takashi Sawanaka	Remove unnecessary #include "Merge.h"	blob \| commitdiff \| diff to current
2016-05-08	Takashi Sawanaka	DIFFRANGE::dbegin[] and dend[] do not need to be an...	blob \| commitdiff \| diff to current
2016-05-04	Takashi Sawanaka	Fix crash when merging	blob \| commitdiff \| diff to current
2016-01-31	Takashi Sawanaka	Remove THIS_FILE	blob \| commitdiff \| diff to current
2015-11-28	sdottaka	Merge with default	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-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-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-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-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-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
2014-11-27	sdottaka	Merge with stable	blob \| commitdiff \| diff to current
2014-11-27	sdottaka	Merge with stable	blob \| commitdiff \| diff to current
2014-11-11	sdottaka	Merge with stable	blob \| commitdiff \| diff to current
2014-11-11	sdottaka	Merge with stable	blob \| commitdiff \| diff to current
2014-10-30	sdottaka	Merge with stable	blob \| commitdiff \| diff to current
2014-10-27	sdottaka	Merge with stable	blob \| commitdiff \| diff to current
2014-10-21	sdottaka	Merge with stable	blob \| commitdiff \| diff to current
2014-10-05	sdottaka	Merge with stable	blob \| commitdiff \| diff to current
2014-10-02	sdottaka	Merge with stable	blob \| commitdiff \| diff to current
2014-10-02	sdottaka	Merge with stable	blob \| commitdiff \| diff to current
2014-09-11	sdottaka	Merge with stable	blob \| commitdiff \| diff to current
2014-09-02	sdottaka	Merge with stable	blob \| commitdiff \| diff to current
2014-07-29	sdottaka	Merge with stable	blob \| commitdiff \| diff to current
2014-06-29	sdottaka	Merge with stable	blob \| commitdiff \| diff to current
2014-06-07	sdottaka	Merge with stable	blob \| commitdiff \| diff to current
next

RSS Atom

About OSDN

Find Software

Develop Software

Help