OSDN Git Service
(root)
/
winmerge-jp
/
winmerge-jp.git
/ history
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
first ⋅ prev ⋅
next
Merge pull request #38 from GreyMerlin/master
[winmerge-jp/winmerge-jp.git]
/
Src
/
2017-09-05
Takashi Sawanaka
Merge pull request #38 from GreyMerlin/master
tree
|
commitdiff
2017-09-04
GreyMerlin
ShellExtension VS2017(4) - Eliminate Warnings
tree
|
commitdiff
2017-09-04
Takashi Sawanaka
Merge
tree
|
commitdiff
2017-09-04
Takashi Sawanaka
Merge pull request #37 from GreyMerlin/master
tree
|
commitdiff
2017-09-04
GreyMerlin
Tweak vs2017.vcxproj.filters
tree
|
commitdiff
2017-09-02
Takashi Sawanaka
Merge.cpp: avoid an assertion failure
tree
|
commitdiff
2017-09-02
Takashi Sawanaka
FolderCompare: Fix sorting of version, eol and encoding...
tree
|
commitdiff
2017-08-29
Takashi Sawanaka
PropMarkerColors.*: Forgot to add the files. github#35
2.14.0+-jp-139
tree
|
commitdiff
2017-08-29
Takashi Sawanaka
Merge pull request #36 from GreyMerlin/fix/jp-138
tree
|
commitdiff
2017-08-29
GreyMerlin
Missing line in .filters file
tree
|
commitdiff
2017-08-28
Takashi Sawanaka
editlib: Implement Marker feature (WIP)
2.14.0+-jp-138
tree
|
commitdiff
2017-08-17
Takashi Sawanaka
Use a vector instead of an array.
tree
|
commitdiff
2017-08-17
Takashi Sawanaka
HexMergeDoc.cpp: Use customized colors for Hex Editor...
tree
|
commitdiff
2017-07-30
Takashi Sawanaka
Merge pull request #32 from GreyMerlin/master
tree
|
commitdiff
2017-07-29
GreyMerlin
VS2017 - update .sln, .vcxproj and .cmd files
tree
|
commitdiff
2017-07-29
GreyMerlin
VS2017 - Copy all *.vs2015 files as *.vs2017
tree
|
commitdiff
2017-07-29
Takashi Sawanaka
Merge pull request #31 from GreyMerlin/master
2.14.0+-jp-137
tree
|
commitdiff
2017-07-28
GreyMerlin
Fix properties for WinXP targeting
tree
|
commitdiff
2017-07-28
GreyMerlin
Add VS Filters to various projects
tree
|
commitdiff
2017-07-27
Takashi Sawanaka
Add Go and Rust syntax highlighter
tree
|
commitdiff
2017-07-17
Takashi Sawanaka
MergeDoc.cpp: Fix incorrect in-line diff coloring after...
tree
|
commitdiff
2017-07-17
Takashi Sawanaka
Remove unused declarations
tree
|
commitdiff
2017-07-16
Takashi Sawanaka
DirCmpReport.*: Create HTML report with UTF-8
tree
|
commitdiff
2017-07-11
Takashi Sawanaka
DirCompProgressBar.*: Use Dynamic Dialog Layout for MFC
tree
|
commitdiff
2017-07-09
Takashi Sawanaka
Merge.cpp: To decrease startup time, call CleanupWMtemp...
tree
|
commitdiff
2017-07-08
Takashi Sawanaka
Format resource file
tree
|
commitdiff
2017-07-08
Takashi Sawanaka
Merge.*vcxproj.filters: Fix filename case
tree
|
commitdiff
2017-07-08
Takashi Sawanaka
multiformatText.cpp: Fix Unpacker plugin not working...
tree
|
commitdiff
2017-07-08
Takashi Sawanaka
MergeEditView.cpp: Fix crash when selecting 'Copy to...
tree
|
commitdiff
2017-07-02
Takashi Sawanaka
StdAfx.*: Move GetClipTcharTextFormat() function from...
tree
|
commitdiff
2017-07-02
Takashi Sawanaka
Upgrade project files to VS2017
tree
|
commitdiff
2017-07-02
Takashi Sawanaka
Add the alternative functions of _fstat() and _wstat...
tree
|
commitdiff
2017-07-01
Takashi Sawanaka
FileOrFolderSelect.cpp: Use paths::DoesPathExist()...
tree
|
commitdiff
2017-06-29
Takashi Sawanaka
Add 'Test' configuration to test WinMerge
tree
|
commitdiff
2017-06-28
Takashi Sawanaka
Add GetDescription() function
tree
|
commitdiff
2017-06-25
Takashi Sawanaka
OptionsMgr.h: Add COptionsMgr::GetNameList() function.
tree
|
commitdiff
2017-06-25
Takashi Sawanaka
MessageBoxDialog.*: Add CMessageBoxDialog::SetFormerRes...
tree
|
commitdiff
2017-06-18
Takashi Sawanaka
MainFrm.cpp: Fix crash when the argument 'flags' of...
tree
|
commitdiff
2017-06-15
Takashi Sawanaka
Merge pull request #29 from GreyMerlin/master
tree
|
commitdiff
2017-06-14
GreyMerlin
Standardize .cmd, .sln and .vcprojx file names (3)
tree
|
commitdiff
2017-06-12
GreyMerlin
Standardize .cmd, .sln and .vcprojx file names (1)
tree
|
commitdiff
2017-05-23
Takashi Sawanaka
MergeDocLineDiffs.cpp: Avoid out of bounds access(2...
tree
|
commitdiff
2017-05-21
Takashi Sawanaka
MergeDocLineDiffs.cpp: Avoid out of bounds access
tree
|
commitdiff
2017-05-21
Takashi Sawanaka
GhostTextBuffer.cpp: Fix crash when redoing to delete...
tree
|
commitdiff
2017-05-05
Takashi Sawanaka
Fix warning C6001: Using uninitialized memory '...'
tree
|
commitdiff
2017-05-04
Takashi Sawanaka
Cppcheck: Checking if unsigned variable '...' is less...
tree
|
commitdiff
2017-05-04
Takashi Sawanaka
Cppcheck: Variable '...' is assigned a value that is...
tree
|
commitdiff
2017-05-04
Takashi Sawanaka
Use std::array
tree
|
commitdiff
2017-05-04
Takashi Sawanaka
Cppcheck: Variable '...' is reassigned a value before...
tree
|
commitdiff
2017-05-04
Takashi Sawanaka
Cppcheck: %d in format string (no. 1) requires 'int...
tree
|
commitdiff
2017-05-03
Takashi Sawanaka
MergeDoc.cpp: Reduce file access times on checking...
tree
|
commitdiff
2017-05-03
Takashi Sawanaka
MessageBoxDialog.cpp: Fix invisible text in high-contra...
tree
|
commitdiff
2017-04-30
Takashi Sawanaka
stringdiffs.cpp: Reduce compiler warnings
tree
|
commitdiff
2017-04-16
Takashi Sawanaka
DirCompProgresBar.cpp: Fix: The range of Progress bar...
tree
|
commitdiff
2017-04-16
Takashi Sawanaka
Fix issue#64 where files and folders that exist only...
tree
|
commitdiff
2017-04-09
Takashi Sawanaka
MainFrm.cpp: Fix crash when changing the font of DirView
2.14.0+-jp-132
tree
|
commitdiff
2017-04-08
Takashi Sawanaka
DirViewColItems.cpp: Fix indentation
tree
|
commitdiff
2017-04-02
Takashi Sawanaka
Fix assertion on WindowsXP
tree
|
commitdiff
2017-04-02
Takashi Sawanaka
ImgMergeFrm.cpp: Fix mixed eol-style
tree
|
commitdiff
2017-03-26
Takashi Sawanaka
Add shortcut(Ctrl+Alt+E) to open with external editor
tree
|
commitdiff
2017-03-26
Takashi Sawanaka
*.vcxproj: Apply GreyMerlin's changes
tree
|
commitdiff
2017-03-25
Takashi Sawanaka
Merge
tree
|
commitdiff
2017-03-21
Takashi Sawanaka
Merge pull request #26 from GreyMerlin/bugfix/DropTarge...
2.14.0+-jp-131
tree
|
commitdiff
2017-03-21
Takashi Sawanaka
Merge pull request #25 from GreyMerlin/feature/TimeStars
tree
|
commitdiff
2017-03-21
Takashi Sawanaka
Merge pull request #24 from GreyMerlin/bugfix/DefaultFonts
tree
|
commitdiff
2017-03-20
GreyMerlin
Cleanup Date column alignment
tree
|
commitdiff
2017-03-20
GreyMerlin
Use proper font for 'View > Use Default Font'
tree
|
commitdiff
2017-03-19
Takashi Sawanaka
Support for diff3-style conflict file. bitbucket#61
tree
|
commitdiff
2017-03-16
Takashi Sawanaka
Merge pull request #23 from GreyMerlin/bugfix/3WayBinary
tree
|
commitdiff
2017-03-16
Takashi Sawanaka
Merge pull request #22 from GreyMerlin/feature/TweakAbout
tree
|
commitdiff
2017-03-16
Takashi Sawanaka
Merge pull request #21 from GreyMerlin/feature/VS2015.2
tree
|
commitdiff
2017-03-15
GreyMerlin
Merge branch 'bugfix/3WayBinary'
tree
|
commitdiff
2017-03-15
GreyMerlin
Merge branch 'feature/TweakAbout'
tree
|
commitdiff
2017-03-15
GreyMerlin
Merge branch 'feature/VS2015.2'
tree
|
commitdiff
2017-03-15
GreyMerlin
Properly handle 3-way comparison of Binary files.
tree
|
commitdiff
2017-03-10
GreyMerlin
Show "(Debug)" in About dialog
tree
|
commitdiff
2017-03-10
GreyMerlin
VS2015.2 - Delete another obsolete Project attribute
tree
|
commitdiff
2017-03-09
Takashi Sawanaka
Merge pull request #20 from GreyMerlin/feature/Readme
tree
|
commitdiff
2017-03-09
Takashi Sawanaka
Merge pull request #19 from GreyMerlin/feature/VS2015
tree
|
commitdiff
2017-03-07
GreyMerlin
Convert to VS2015 - (Warnings)
tree
|
commitdiff
2017-03-07
GreyMerlin
Convert to VS2015 - (MultiProcessor Compilations)
tree
|
commitdiff
2017-03-07
GreyMerlin
Convert to VS2015 - (oops #2)
tree
|
commitdiff
2017-03-06
GreyMerlin
Convert to VS2015 - Step 6 (Simplify #2)
tree
|
commitdiff
2017-03-06
GreyMerlin
Convert to VS2015 - Step 4 (Unicode)
tree
|
commitdiff
2017-03-06
GreyMerlin
Convert to VS2015 - Step 3 (Win32)
tree
|
commitdiff
2017-03-06
GreyMerlin
Convert to VS2015 - Step 2 (Win64)
tree
|
commitdiff
2017-03-06
GreyMerlin
Convert to VS2015 - Step 1
tree
|
commitdiff
2017-03-05
Takashi Sawanaka
Folder Compare: Add 'Parent Folder' menu item in 'Open...
tree
|
commitdiff
2017-03-04
Takashi Sawanaka
Options dialog: Update color buttons when importing...
tree
|
commitdiff
2017-02-26
Takashi Sawanaka
Add Dragging Mode menu item
tree
|
commitdiff
2017-02-26
Takashi Sawanaka
ImgMergeFrm.cpp: Allow to scroll by PageUp/PageDown key
tree
|
commitdiff
2017-02-26
Takashi Sawanaka
Improve support for high-contrast-mode
tree
|
commitdiff
2017-02-25
Takashi Sawanaka
Add 'Margin' color button to 'Colors/Text' setting...
tree
|
commitdiff
2017-02-05
Takashi Sawanaka
When comparing three folders Right EOL and Right Encodi...
tree
|
commitdiff
2017-01-29
Takashi Sawanaka
unicoder.cpp: CheckForInvalidUtf8() did not work correc...
tree
|
commitdiff
2017-01-09
Takashi Sawanaka
Merge
tree
|
commitdiff
2017-01-09
Takashi Sawanaka
Enabled to move to the next/previous file with the...
tree
|
commitdiff
2017-01-09
Takashi Sawanaka
MessageBoxDialog.{cpp,h}: Add GetFormerResult() method...
tree
|
commitdiff
2017-01-08
Takashi Sawanaka
DirScan.cpp: Fix assertion failure
tree
|
commitdiff
2017-01-05
Takashi Sawanaka
Merge pull request #16 from Lippe35/master
tree
|
commitdiff
next