OSDN Git Service

Update of Lithuanian translation (#496)
[winmerge-jp/winmerge-jp.git] / Src / MergeDoc.cpp
2020-11-30 Takashi SawanakaFixed some untranslated strings
2020-11-01 Takashi SawanakaSyntax-highlighter-based comment filter (Fix osdn.net...
2020-10-26 Takashi SawanakaUpdate English.pot (2)
2020-10-24 Takashi SawanakaFix GitHub issue #452: Automatically scroll to first...
2020-10-24 Takashi SawanakaMergeEditView: Add SetActivePane() function
2020-10-18 Takashi SawanakaMerge pull request #458 from qosobrin/master
2020-10-18 Takashi SawanakaMerge pull request #457 from tjmprm77/feature/sync_poin...
2020-10-17 LMSMerge pull request #8 from WinMerge/master
2020-10-17 Jun TajimaFix the problem accessing the text buffer out of range...
2020-09-22 Takashi SawanakaMerge pull request #435 from tjmprm77/feature/sync_poin...
2020-09-22 Jun TajimaFix the problem that the comparison result is displayed...
2020-09-08 Takashi SawanakaMerge branch 'master' into master
2020-08-27 LMSMerge pull request #7 from WinMerge/master
2020-08-16 Takashi SawanakaFix a bug where the title of the tabs in the file compa...
2020-08-09 Takashi Sawanaka- Fix the problem that pressing the F4 key did not...
2020-08-05 LMSMerge pull request #6 from WinMerge/master
2020-07-28 Takashi SawanakaMerge branch 'master' into master
2020-07-26 Takashi SawanakaMerge pull request #384 from silid/master
2020-07-26 Takashi SawanakaMade it possible to display the contents of CSV and...
2020-06-27 Takashi SawanakaFix GitHub issue #362: opening same file (2)
2020-06-24 Takashi Sawanakacrystaledit: Move TextDefinition and TextType to Crysta...
2020-06-14 Takashi SawanakaFix GitHub issue #362: opening same file
2020-06-10 Takashi SawanakaFix an issue where the cursor would move to the beginni...
2020-06-08 Takashi SawanakaMerge pull request #360 from igorruckert/patch-1
2020-06-08 Takashi SawanakaFix GitHub issue #358: Moved ghost lines are shown...
2020-05-24 Takashi SawanakaFix GitHub issue #351: Crush-report.
2020-05-20 LMSMerge pull request #5 from WinMerge/master
2020-05-16 Takashi SawanakaUse SPDX license identifier
2020-04-25 LMSMerge pull request #2 from WinMerge/master
2020-04-25 Takashi SawanakaFix GitHub issue #320: Codepage not updated on refresh
2020-04-01 Takashi SawanakaFix GitHub issue #297: Allow specifying default for...
2020-03-29 Takashi Sawanaka- Add Solarized Dark/Light color scheme
2020-03-21 Takashi SawanakaFix an issue where EOL differences are highlighted...
2020-01-19 Takashi SawanakaFix osdn issue #39924: An error message is shown when...
2019-12-21 Takashi SawanakaFix issue where active pane is not restored correctly
2019-10-24 Стоян ДимитровMerge remote-tracking branch 'upstream/master'
2019-10-15 TichijMerge branch 'master' of https://github.com/WinMerge...
2019-10-01 Takashi SawanakaFix GitHub issue #191: "Recompare as" menu option doesn...
2019-10-01 Takashi SawanakaMerge branch 'master' of https://github.com/winmerge...
2019-10-01 Takashi SawanakaFix GitHub issue #191: "Recompare as" menu option doesn...
2019-09-12 Takashi SawanakaFix GitHub issue #180: Performance using Unpacker
2019-09-03 Стоян ДимитровMerge remote-tracking branch 'upstream/master'
2019-09-01 Takashi SawanakaMergeDoc.cpp: Fixes an issue where the command line...
2019-09-01 Takashi SawanakaFix a crash when merging selections if the last line...
2019-07-04 Takashi SawanakaReduce the size of the executable file (3)
2019-06-02 Takashi SawanakaMerge branch 'master' of https://github.com/gandf/winme...
2019-06-02 gandfMerge pull request #2 from WinMerge/master
2019-05-31 Tim GerundtFile report: Fix a problem without showing line numbers
2019-05-29 Tim GerundtFile report: Add a border on table level
2019-05-29 Tim GerundtFile report: Tweak line numbers padding
2019-05-28 Tim GerundtUse line number instead "." as link in file report
2019-05-28 Tim GerundtUse "colspan" for file report titles
2019-05-28 Tim GerundtDrop "border" <div> from HTML reports
2019-04-06 Takashi SawanakaRename CChlidFrame class to CMergeEditFrame class
2019-04-06 Takashi SawanakaWord-level merging did not work correctly if the number...
2019-03-31 Takashi SawanakaMergeDoc.cpp: 'Copy All To Left/right' did not work...
2019-03-31 Takashi SawanakaMerge
2019-03-31 Takashi SawanakaChange std::vector<T> output argument to return value
2019-03-30 Takashi SawanakaMergeDoc.cpp: Fix mixed eol-style
2019-03-30 Takashi SawanakaMerged in gerundt/winmerge (pull request #35)
2019-03-14 Takashi Sawanakaword level diff dit not work if the text contains NUL...
2019-03-13 Takashi SawanakaFix crash when failed to load file
2019-03-10 Takashi SawanakaDelete bForceUTF8 argument that no longer makes sense
2019-03-10 Takashi SawanakaMergeDoc.cpp: 'Copy All To Left/right' did not work...
2019-03-10 Takashi SawanakaRemove IF_IS_TRUE_ALL macro
2019-02-24 Takashi SawanakaUse COptionsMgr instead of GetProfile*() and WriteProfi...
2019-02-17 Takashi Sawanaka'Automatically scroll to first difference' option did...
2019-02-01 Takashi SawanakaMerge ... Timon34/russianpo-edited-online-with-bitbucke...
2019-01-27 Takashi SawanakaMergeDoc.cpp: Recover lost compatibility
2019-01-22 Takashi SawanakaMergeDoc.cpp: If the command line option /x is specifie...
2019-01-20 Takashi SawanakaDelay calling InitialUpdateFrame() to reduce unnecessar...
2019-01-14 Takashi SawanakaMainFrm.h: Fix a problem which the size of header paths...
2019-01-12 Takashi SawanakaFix "Assertion failed: dr.begin[0] == dr.begin[file...
2019-01-05 GreyMerlinAdditional low-level cleanups (5)
2019-01-05 GreyMerlinAdditional low-level cleanups (4)
2019-01-05 GreyMerlinAdditional low-level cleanups (2)
2019-01-01 Takashi SawanakaAdd support for merging word level diffs in selection.
2018-12-17 Takashi SawanakaMerged in Tichij/winmerge (pull request #7)
2018-12-12 Takashi SawanakaMergeDoc.cpp: Add "Don't ask this question again" check...
2018-12-09 Takashi SawanakaMerge
2018-12-09 Takashi SawanakaMerge pull request #111 from GreyMerlin/master
2018-12-08 GreyMerlinRemove `nFinalNullLines` checking, disabled by an earli...
2018-12-02 Takashi SawanakaAdd File/Recompare As/Image menu item
2018-11-18 Takashi SawanakaMergeDoc.cpp: Fix github issue #106 File compare always...
2018-11-12 Takashi SawanakaMergeDoc.cpp: clear GGhostTextBuffer::m_RealityBlock...
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-28 GreyMerlinVarious refactorings involving NULL, ASSERT, TRUE and...
2018-10-28 GreyMerlinVarious refactorings involving NULL, ASSERT, TRUE and...
2018-10-12 Takashi SawanakaMerge pull request #97 from GreyMerlin/master
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-09-20 sdottaka@users.sou... Merge
next