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

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

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

2015-05-10	sdottaka	Merge with stable	blob \| commitdiff
2015-05-10	sdottaka	Reduce source code size	blob \| commitdiff \| diff to current
2015-05-09	sdottaka	Move ID_VIEW_WHITESPACE menu handler in CMainFrame...	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-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-29	sdottaka	Rename ID_* to IDS_* for String ID	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	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-24	sdottaka	Enable syntax highlight in word diff text blocks.	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-23	sdottaka	Remove some warnings	blob \| commitdiff \| diff to current
2014-02-16	sdottaka	Merge with stable	blob \| commitdiff \| diff to current
2014-02-09	sdottaka	Merge with stable	blob \| commitdiff \| diff to current
2014-01-28	sdottaka	Merge with stable	blob \| commitdiff \| diff to current
2014-01-25	sdottaka	Merge with stable	blob \| commitdiff \| diff to current
2014-01-23	sdottaka	3way-diff: Don't highlight the word diff in right pane...	blob \| commitdiff \| diff to current
2014-01-20	sdottaka	Merge with stable	blob \| commitdiff \| diff to current
2014-01-19	sdottaka	Add Shift+F4 shortcut key for selecting previous word...	blob \| commitdiff \| diff to current
2014-01-18	sdottaka	* Remove "Copy Left to Middle(Alt+4)" and "Copy Right...	blob \| commitdiff \| diff to current
2014-01-18	sdottaka	Merge with stable	blob \| commitdiff \| diff to current
2014-01-18	sdottaka	* Use standard order of header files	blob \| commitdiff \| diff to current
2014-01-14	sdottaka	Merge with stable	blob \| commitdiff \| diff to current
2014-01-13	sdottaka	Add "Copy from Left" and "Copy from Right" menu items	blob \| commitdiff \| diff to current
2014-01-12	sdottaka	Merge with stable	blob \| commitdiff \| diff to current
2014-01-12	sdottaka	Add "Next Conflict", "Previous Conflict" and "Auto...	blob \| commitdiff \| diff to current
2014-01-05	sdottaka	Merge with stable	blob \| commitdiff \| diff to current
2014-01-04	sdottaka	Merge with stable	blob \| commitdiff \| diff to current
2013-12-28	sdottaka	Merge with stable	blob \| commitdiff \| diff to current
2013-12-22	sdottaka	Merge with stable	blob \| commitdiff \| diff to current
2013-12-08	sdottaka	Merge with stable	blob \| commitdiff \| diff to current
2013-11-27	sdottaka	Merge with stable	blob \| commitdiff \| diff to current
2013-11-18	sdottaka	Merge with stable	blob \| commitdiff \| diff to current
2013-10-27	sdottaka	Merge with stable	blob \| commitdiff \| diff to current
2013-10-21	sdottaka	Merge with stable	blob \| commitdiff \| diff to current
2013-10-20	sdottaka	Merge with stable	blob \| commitdiff \| diff to current
2013-09-29	sdottaka	Merge with stable	blob \| commitdiff \| diff to current
2013-09-09	sdottaka	Merge with stable	blob \| commitdiff \| diff to current
2013-09-09	sdottaka	Fix unsynchronized header bar and editor panes while...	blob \| commitdiff \| diff to current
2013-08-31	sdottaka	Add string_to_str()	blob \| commitdiff \| diff to current
2013-08-27	sdottaka	Merge with stable	blob \| commitdiff \| diff to current
2013-08-18	sdottaka	Delete unnecessary CMergeEditView::OnPluginsList()	blob \| commitdiff \| diff to current
2013-08-18	sdottaka	Delete unnecessary CMergeEditView::OnPluginsList()	blob \| commitdiff \| diff to current
2013-07-23	sdottaka	Merge with stable	blob \| commitdiff \| diff to current
2013-10-20	sdottaka	Add synchronization points UI like meld(meldmerge.org)	blob \| commitdiff \| diff to current
2013-07-14	sdottaka	Merge r8138	blob \| commitdiff \| diff to current
2013-07-14	sdottaka	Merge r8129	blob \| commitdiff \| diff to current
2013-07-14	sdottaka	Merge r8128	blob \| commitdiff \| diff to current
2013-07-07	sdottaka	Merge with rev.8128	blob \| commitdiff \| diff to current
2013-07-07	sdottaka	Merge with rev.8123	blob \| commitdiff \| diff to current
2013-07-07	sdottaka	Add string_stoi() function similar to C++11 std::stoi()	blob \| commitdiff \| diff to current
2013-07-06	sdottaka	* Replace CString with String	blob \| commitdiff \| diff to current
2013-06-28	sdottaka	Merge	blob \| commitdiff \| diff to current
2013-06-23	sdottaka	Merge	blob \| commitdiff \| diff to current
2013-06-23	sdottaka	Merge rev.8105	blob \| commitdiff \| diff to current
2013-06-17	sdottaka	Use _() macro instead of LoadString() (2)	blob \| commitdiff \| diff to current
2013-06-15	sdottaka	Merge rev. 8098-8100	blob \| commitdiff \| diff to current
2013-06-10	sdottaka	* Use _() macro instead of LoadString()	blob \| commitdiff \| diff to current
next

RSS Atom

About OSDN

Find Software

Develop Software

Help