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
Update CWindowsManagerDialog - check some pointers for null and made … (#824) (2)
[winmerge-jp/winmerge-jp.git]
/
Src
/
ConflictFileParser.cpp
2021-05-05
Takashi Sawanaka
GuessCodepageEncoding() -> codepage_detect::Guess()
blob
|
commitdiff
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
2019-03-30
Takashi Sawanaka
Merged in gerundt/winmerge (pull request #35)
blob
|
commitdiff
|
diff to current
2019-03-09
Takashi Sawanaka
Reduce compilation time (2)
blob
|
commitdiff
|
diff to current
2017-05-04
Takashi Sawanaka
Cppcheck: Variable '...' is assigned a value that is...
blob
|
commitdiff
|
diff to current
2017-03-25
Takashi Sawanaka
Merge
blob
|
commitdiff
|
diff to current
2017-03-19
Takashi Sawanaka
Support for diff3-style conflict file. bitbucket#61
blob
|
commitdiff
|
diff to current
2016-11-19
Takashi Sawanaka
Merge
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
2012-11-04
sdottaka
- Remove MFC dependency
blob
|
commitdiff
|
diff to current
2012-09-08
sdottaka
Remove MFC dependency
blob
|
commitdiff
|
diff to current
2011-04-28
sdottaka
Merge rev.7791
blob
|
commitdiff
|
diff to current
2011-01-08
sdottaka
Merge from rev.7448
blob
|
commitdiff
|
diff to current
2010-06-29
sdottaka
Merge from rev.7205
blob
|
commitdiff
|
diff to current
2010-05-23
sdottaka
Merge from rev.7128:7151
blob
|
commitdiff
|
diff to current
2010-05-02
sdottaka
Merge from rev.7121:7123
blob
|
commitdiff
|
diff to current
2010-04-29
sdottaka
Merge from rev.7103:7118
blob
|
commitdiff
|
diff to current
2010-04-18
sdottaka
Apply my experimental code and fixes for Japanese MS...
2.13.11+-jp-8
blob
|
commitdiff
|
diff to current
2009-04-03
Takashi Sawanaka
BUG: [ 2550412 ] When conflictfile saved trailing line...
blob
|
commitdiff
|
diff to current
2009-02-23
Kimmo Varis
Remove unneeded string conversions.
blob
|
commitdiff
|
diff to current
2008-09-07
Marcel Gosselin
Use bool instead of BOOL for all UniFile code
blob
|
commitdiff
|
diff to current
2008-08-29
Jochen Tucht
Patch #2081779 - Revised command line processing
blob
|
commitdiff
|
diff to current
2008-07-17
Kimmo Varis
Convert UniFile to use String (remove rest of CStrings).
blob
|
commitdiff
|
diff to current
2008-01-27
Kimmo Varis
PATCH: [ 1880423 ] Check if file is a conflict file...
blob
|
commitdiff
|
diff to current
2008-01-22
Kimmo Varis
PATCH: [ 1875129 ] Resolve conflict files
blob
|
commitdiff
|
diff to current
2008-01-22
Kimmo Varis
Fix a bug in ConflictFileParser - it created extra...
blob
|
commitdiff
|
diff to current
2008-01-20
Kimmo Varis
PATCH: [ 1875129 ] Resolve conflict files
blob
|
commitdiff
|
diff to current
OSDN Git Service
