OSDN Git Service

(root) / winmerge-jp / winmerge-jp.git / history
? search:
summary | shortlog | log | commit | commitdiff | tree
first ⋅ prev ⋅ next
- Use Poco::RegularExpression instead of PCRE library. (Poco::RegularExpression inter...
[winmerge-jp/winmerge-jp.git] / Src / MergeDoc.cpp
2012-08-30 sdottaka- Use Poco::RegularExpression instead of PCRE library... blob | commitdiff
2012-02-12 sdottakaAdd Include File Compare Report check box in DirCmpRepo... blob | commitdiff | diff to current
2012-02-05 sdottakaFix the problem that WinMerge treated 'ケ' and 'パ' as... blob | commitdiff | diff to current
2011-12-17 sdottakaReplace BOOL with bool blob | commitdiff | diff to current
2011-11-13 sdottakaremove unnecessary files blob | commitdiff | diff to current
2011-08-07 sdottakalearning about boost::scoped_* ... blob | commitdiff | diff to current
2011-05-15 sdottakaFix assertion when clicking OK button in Codepage category blob | commitdiff | diff to current
2011-05-15 sdottakaAdd Hex view button to Encoding Error Dialog blob | commitdiff | diff to current
2011-05-07 sdottakaAdd encoding error dialog for encoding error blob | commitdiff | diff to current
2011-05-02 sdottakaFix some warnings blob | commitdiff | diff to current
2011-05-02 sdottakaUse MergeEditView instead of MergeDiffDetailView to... blob | commitdiff | diff to current
2011-04-28 sdottakaMerge rev.7791 blob | commitdiff | diff to current
2011-01-08 sdottakaMerge from rev.7448 blob | commitdiff | diff to current
2010-10-11 sdottakaMerge from rev. 7240:7241 (Tim's changes) 2.13.13+-jp-7 blob | commitdiff | diff to current
2010-10-11 sdottakaRestore caret y-position when reloading changed files blob | commitdiff | diff to current
2010-06-29 sdottakaMerge from rev.7205 blob | commitdiff | diff to current
2010-06-13 Jochen TuchtRemove unnecessary #include "dllver.h" blob | commitdiff | diff to current
2010-06-12 Kimmo VarisBUG: #2995925 No refreshing after merging difference blob | commitdiff | diff to current
2010-05-23 sdottakaMerge from rev.7128:7151 blob | commitdiff | diff to current
2010-05-02 sdottakaMerge from rev.7121:7123 blob | commitdiff | diff to current
2010-04-29 sdottakaMerge from rev.7103:7118 blob | commitdiff | diff to current
2010-04-18 sdottakaApply my experimental code and fixes for Japanese MS... 2.13.11+-jp-8 blob | commitdiff | diff to current
2010-01-14 Kimmo VarisPATCH: [ 2931558 ] some smal cleanups blob | commitdiff | diff to current
2010-01-09 Kimmo VarisAutomatic rescanning was not disabled everywhere. blob | commitdiff | diff to current
2009-12-31 Kimmo VarisPATCH: [ 2922517 ] panes gets unaligned if differs... blob | commitdiff | diff to current
2009-12-27 Kimmo VarisPATCH: [ 2921555 ] selected codepage is not used blob | commitdiff | diff to current
2009-08-01 Kimmo VarisRFE [ 2827836 ] Auto Close if Compare is the Same blob | commitdiff | diff to current
2009-07-25 Kimmo VarisMake SanityCheckDiff() a const method. Its task is... blob | commitdiff | diff to current
2009-07-02 Kimmo VarisMake few variables consts. blob | commitdiff | diff to current
2009-07-02 Kimmo VarisOptimize merging list of differences. Give diff number... blob | commitdiff | diff to current
2009-06-29 Kimmo VarisUse std::vector instead of CArray for storing linedata... blob | commitdiff | diff to current
2009-05-12 Kimmo VarisBUG: [ 2022312 ] Opening mixed-EOL file forces other... blob | commitdiff | diff to current
2009-05-08 Tim GerundtBUG: [ 2783477 ] Generated Report: Inaccurate DOCTYPE blob | commitdiff | diff to current
2009-04-19 Kimmo VarisBUG: [ 2772646 ] left & right description is the same one blob | commitdiff | diff to current
2009-04-13 Kimmo VarisPATCH: [ 2726531 ] Show XML config files like XML files blob | commitdiff | diff to current
2009-03-23 Kimmo VarisPATCH: [ 2672737 ] Wrong ""The selected files are ident... blob | commitdiff | diff to current
2009-03-19 Kimmo VarisBUG: [ 2661838 ] 2.10.4.0 swap panes should swap stats too blob | commitdiff | diff to current
2009-02-25 Kimmo VarisRemove unused variables. blob | commitdiff | diff to current
2009-01-19 Kimmo VarisBUG: [ 2515875 ] "File->New" creates "disappeared"... blob | commitdiff | diff to current
2009-01-15 Kimmo VarisBuild fix: add needed include line. blob | commitdiff | diff to current
2009-01-15 Kimmo VarisBUG: [ 2493945 ] Crash if one of the diffed file was... blob | commitdiff | diff to current
2009-01-15 Kimmo VarisBUG: [ 2493980 ] Compare Window: Difference 4 of 1 blob | commitdiff | diff to current
2008-11-28 Kimmo VarisPATCH: [ 2354125 ] Reload file when it has been changed... blob | commitdiff | diff to current
2008-10-20 Kimmo VarisPATCH: [ 2175736 ] Add compare statuses without bin... blob | commitdiff | diff to current
2008-08-21 Kimmo VarisPATCH: [ 2056741 ] ignore EOL dialog fix blob | commitdiff | diff to current
2008-08-13 Marcel GosselinUse bool/true/false instead of BOOL/TRUE/FALSE in some... blob | commitdiff | diff to current
2008-08-08 Marcel GosselinUse std::swap instead of home-made swap blob | commitdiff | diff to current
2008-08-01 Kimmo VarisUse std::vector for undo records. Optimize allocation... blob | commitdiff | diff to current
2008-07-30 Kimmo VarisOptimize line replace. Don't bother clearing the string... blob | commitdiff | diff to current
2008-07-29 Kimmo VarisPATCH: [ 2027325 ] "Syntax Highlight" menu item enabled... blob | commitdiff | diff to current
2008-07-17 Kimmo VarisConvert UniFile to use String (remove rest of CStrings). blob | commitdiff | diff to current
2008-07-16 Kimmo VarisConvert rest of CStrings to Strings in unicoder. Bunch... blob | commitdiff | diff to current
2008-07-15 Kimmo VarisUse enum UNICODESET instead of int as a unicoding variable. blob | commitdiff | diff to current
2008-07-09 Kimmo VarisPATCH: [ 2013845 ] Add option to enable plugins (disabl... blob | commitdiff | diff to current
2008-06-24 Kimmo VarisUse CRLFSTYLE enum as a EOL style type instead of int. blob | commitdiff | diff to current
2008-06-23 Kimmo VarisPATCH: [ 2001190 ] Split CDiffTextBuffer to own files blob | commitdiff | diff to current
2008-06-22 Kimmo VarisTODO: [ 1879979 ] Uni*File::ReadBom() used to check... blob | commitdiff | diff to current
2008-06-07 Kimmo VarisPATCH: [ 1984346 ] Archive reports don't include origin... blob | commitdiff | diff to current
2008-03-23 Takashi SawanakaPATCH: [ 1923625 ] Fix for BUG:[ 1921031 ] Undo after... blob | commitdiff | diff to current
2008-02-26 Kimmo VarisPATCH: [ 1901547 ] Enable mixed EOLs per document blob | commitdiff | diff to current
2008-02-25 Takashi SawanakaBUG: [ 1900257 ] No comparing of new files blob | commitdiff | diff to current
2008-02-24 Takashi SawanakaBUG: [ 1900728 ] Cannot select encoding of files that... blob | commitdiff | diff to current
2008-02-19 Kimmo VarisConvert path in FileLocation to String. blob | commitdiff | diff to current
2008-02-15 Kimmo VarisUse FileTextEncoding member in MergeDoc / CDiffTextBuff... blob | commitdiff | diff to current
2008-02-11 Takashi SawanakaBUG: [ 1880628 ] LineFilter doesn't filter out non... blob | commitdiff | diff to current
2008-02-05 Kimmo VarisPATCH: [ 1886576 ] Convert LineFiltersList to use String blob | commitdiff | diff to current
2008-01-31 Jochen TuchtPatch #1880711 blob | commitdiff | diff to current
2008-01-26 Kimmo VarisPATCH: [ 1879271 ] Detect UTF-8 files without BOM as... blob | commitdiff | diff to current
2008-01-19 Kimmo VarisPATCH: [ 1874084 ] Remove unused binary status error... blob | commitdiff | diff to current
2008-01-18 Kimmo VarisPATCH: [ 1874047 ] Simpler temp file class blob | commitdiff | diff to current
2008-01-16 Kimmo VarisCleanup file loading code by creating couple of helper... blob | commitdiff | diff to current
2008-01-16 Kimmo VarisConvert description texts in CMainFrame to array. blob | commitdiff | diff to current
2008-01-14 Takashi SawanakaPATCH: [ 1871079 ] File Encoding dialog for MergeDoc blob | commitdiff | diff to current
2008-01-13 Jochen TuchtPatch #1869647 blob | commitdiff | diff to current
2008-01-09 Tim GerundtFix spelling error "succesfully". blob | commitdiff | diff to current
2007-12-17 Kimmo VarisPATCH: [ 1851921 ] Add option to preserve original... blob | commitdiff | diff to current
2007-11-27 Jochen TuchtPatch #1795678 blob | commitdiff | diff to current
2007-11-13 Jochen TuchtPatch #1804762 continued - Fix Bug #1829829 continued blob | commitdiff | diff to current
2007-11-11 Jochen TuchtPatch #1804762 continued - Fix Bug #1829829 blob | commitdiff | diff to current
2007-11-03 Jochen TuchtPatch #1804762 continued blob | commitdiff | diff to current
2007-10-16 Jochen TuchtPatch #1804762 continued blob | commitdiff | diff to current
2007-10-14 Jochen TuchtPatch #1804762 continued blob | commitdiff | diff to current
2007-10-12 Kimmo VarisPATCH: [ 1811745 ] Do not merge ignored differences... blob | commitdiff | diff to current
2007-10-05 Jochen TuchtPatch #1804762 continued blob | commitdiff | diff to current
2007-10-05 Kimmo VarisCleanup SaveClosing dialog code, add comments. blob | commitdiff | diff to current
2007-09-17 Takashi SawanakaBUG: [ 1795814 ] When word wrap+scroll to first are... blob | commitdiff | diff to current
2007-09-04 Kimmo VarisPATCH: [ 1787154 ] Convert SplitFileName() to use String blob | commitdiff | diff to current
2007-07-30 Kimmo VarisPATCH: [ 1763070 ] Convert (Diff)FileInfo to use String blob | commitdiff | diff to current
2007-07-20 Kimmo VarisPATCH: [ 1756446 ] Fix assert when refresh happens... blob | commitdiff | diff to current
2007-07-14 Takashi SawanakaPATCH: [ 1739209 ] Patch for RFE:1665229 HTML report... blob | commitdiff | diff to current
2007-04-11 Kimmo VarisFix assert caused by my checkin 2007-04-08 Remove coupl... blob | commitdiff | diff to current
2007-04-08 Kimmo VarisRemove couple of useless wrapper functions blob | commitdiff | diff to current
2007-03-21 Gal HammerRFE: [ 1646407 ] Use "equal" or "not equal" as file... blob | commitdiff | diff to current
2007-03-17 Kimmo VarisPATCH: [ 1682475 ] Improve Line filters dialog blob | commitdiff | diff to current
2007-03-13 Kimmo VarisPATCH: [ 1679196 ] Cleanup logfile class usage blob | commitdiff | diff to current
2007-02-07 Kimmo VarisPATCH: [ 1652696 ] Add more options for backup files blob | commitdiff | diff to current
2007-01-08 Kimmo VarisPATCH: [ 1593810 ] Line-filtering post compare blob | commitdiff | diff to current
2006-12-10 Takashi SawanakaPATCH: [ 1447744 ] Match lines inside diff blocks ... blob | commitdiff | diff to current
2006-12-05 Kimmo VarisPATCH: [ 1608846 ] Create a class for moved blocks blob | commitdiff | diff to current
2006-11-25 Kimmo VarisPATCH: [ 1602365 ] Move SelectFile and SelectFolder... blob | commitdiff | diff to current
next
About OSDN
Find Software
Develop Software
Help