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

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

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

2021-04-10	Takashi Sawanaka	Fix that the Next File or Previous File button on the...	blob \| commitdiff
2021-02-21	elsonwei	Add "Copy Selected Line(s) to/from Left/Right" feature...	blob \| commitdiff \| diff to current
2021-02-12	Jun Tajima	Add a feature to set up default highlighting by a file...	blob \| commitdiff \| diff to current
2021-02-07	Takashi Sawanaka	Fix sf.net #2237: The position selected by clicking...	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-17	ranjwarrior	Feature Request: Move To Next File option while compari...	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
2021-01-01	ranjwarrior	Swap Panes functionality for 3 way compares (https...	blob \| commitdiff \| diff to current
2020-11-22	Jun Tajima	Add the feature "Go to Moved Line". (#484)	blob \| commitdiff \| diff to current
2020-10-24	Takashi Sawanaka	MergeEditView: Add SetActivePane() function	blob \| commitdiff \| diff to current
2020-10-17	LMS	Merge pull request #8 from WinMerge/master	blob \| commitdiff \| diff to current
2020-10-13	Takashi Sawanaka	Display the dialog or menu associated with that positio...	blob \| commitdiff \| diff to current
2020-09-27	Takashi Sawanaka	Fix GitHub issue #265: how to show white space with...	blob \| commitdiff \| diff to current
2020-09-08	Takashi Sawanaka	Merge branch 'master' into master	blob \| commitdiff \| diff to current
2020-08-27	Takashi Sawanaka	MergeEditView.*: When scrolling with the horizontal...	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-05-13	Takashi Sawanaka	Fix osdn.net ticket 40407: Fix a problem where markers...	blob \| commitdiff \| diff to current
2020-05-07	Takashi Sawanaka	Fix Github issue #307(3): Diff Pane issues(2.)	blob \| commitdiff \| diff to current
2020-05-07	Takashi Sawanaka	Fix Github issue #307(2): Diff Pane issues(1.)	blob \| commitdiff \| diff to current
2019-12-08	Takashi Sawanaka	Fix an issue where the operation of changing the select...	blob \| commitdiff \| diff to current
2019-07-04	Takashi Sawanaka	Reduce the size of the executable file (3)	blob \| commitdiff \| diff to current
2019-07-03	Takashi Sawanaka	Fix GitHub issue #159: file compare : right-click doesn...	blob \| commitdiff \| diff to current
2019-04-14	Takashi Sawanaka	Merged in gerundt/winmerge (pull request #37)	blob \| commitdiff \| diff to current
2019-04-10	Takashi Sawanaka	MergeEditView.*: Add 'Shell Menu' menu item in context...	blob \| commitdiff \| diff to current
2019-03-30	Takashi Sawanaka	Merged in gerundt/winmerge (pull request #35)	blob \| commitdiff \| diff to current
2019-03-17	Takashi Sawanaka	FolderCompare: Display folder size	blob \| commitdiff \| diff to current
2019-01-01	Takashi Sawanaka	Add support for merging word level diffs in selection.	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-10-08	Takashi Sawanaka	MergeEditView.*: Remove an unused function	blob \| commitdiff \| diff to current
2018-09-20	sdottaka@users.sou...	Merge	blob \| commitdiff \| diff to current
2018-09-09	Takashi Sawanaka	Delete OnUpdate*() which does not matter if deleted	blob \| commitdiff \| diff to current
2018-06-09	Takashi Sawanaka	Add Window/Split menu item	blob \| commitdiff \| diff to current
2017-10-21	Takashi Sawanaka	Fix some methods in subclass being no longer called	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-17	Takashi Sawanaka	Use a vector instead of an array.	blob \| commitdiff \| diff to current
2016-11-19	Takashi Sawanaka	Merge	blob \| commitdiff \| diff to current
2016-09-04	Takashi Sawanaka	Make merge editor window D&Dable	blob \| commitdiff \| diff to current
2016-08-15	Takashi Sawanaka	Cppcheck: Result of operator '\|' is always true if...	blob \| commitdiff \| diff to current
2016-01-31	Takashi Sawanaka	Cppcheck: C-style pointer casting	blob \| commitdiff \| diff to current
2015-05-10	sdottaka	Merge with stable	blob \| commitdiff \| diff to current
2015-05-09	sdottaka	Move ID_VIEW_WHITESPACE menu handler in CMainFrame...	blob \| commitdiff \| diff to current
2015-05-03	sdottaka	Merge with stable	blob \| commitdiff \| diff to current
2015-05-03	sdottaka	Use CWaitCursor class instead of WaitStatusCursor class...	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-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	Fix a compilation error (debug build)	blob \| commitdiff \| diff to current
2014-10-02	sdottaka	Constify some methods	blob \| commitdiff \| diff to current
2014-10-02	sdottaka	Merge with stable	blob \| commitdiff \| diff to current
2014-09-22	sdottaka	Move Merge Mode code in (MergeDoc.*, MergeEditView...	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
2014-05-06	sdottaka	Merge with stable	blob \| commitdiff \| diff to current
2014-05-03	sdottaka	Merge with stable	blob \| commitdiff \| diff to current
2014-03-29	sdottaka	Merge with stable	blob \| commitdiff \| diff to current
2014-02-23	sdottaka	Merge with stable	blob \| commitdiff \| diff to current
2014-02-16	sdottaka	Merge with stable	blob \| commitdiff \| diff to current
next

RSS Atom

About OSDN

Find Software

Develop Software

Help