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 with stable
[winmerge-jp/winmerge-jp.git]
/
Src
/
MergeEditView.h
2014-01-18
sdottaka
Merge with stable
blob
|
commitdiff
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-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-10-20
sdottaka
Add synchronization points UI like meld(meldmerge.org)
blob
|
commitdiff
|
diff to current
2013-05-13
sdottaka
Move loading/saving diff color settings code to Options...
blob
|
commitdiff
|
diff to current
2011-12-17
sdottaka
Replace BOOL with bool
blob
|
commitdiff
|
diff to current
2011-05-15
sdottaka
expand scope of word level diff from one line to one...
blob
|
commitdiff
|
diff to current
2011-05-07
sdottaka
Fix mixed EOL
blob
|
commitdiff
|
diff to current
2011-05-02
sdottaka
Use MergeEditView instead of MergeDiffDetailView to...
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...
blob
|
commitdiff
|
diff to current
2009-04-14
Kimmo Varis
PATCH: [ 2669526 ] ViewColor
blob
|
commitdiff
|
diff to current
2009-04-03
Kimmo Varis
PATCH: [ 2669526 ] ViewColor
blob
|
commitdiff
|
diff to current
2009-03-19
Kimmo Varis
BUG: [ 2661838 ] 2.10.4.0 swap panes should swap stats too
blob
|
commitdiff
|
diff to current
2008-08-13
Marcel Gosselin
Use bool/true/false instead of BOOL/TRUE/FALSE in some...
blob
|
commitdiff
|
diff to current
2008-07-20
Kimmo Varis
Don't store both handle and pointer to LocationView...
blob
|
commitdiff
|
diff to current
2008-07-19
Kimmo Varis
Remove unused member variable (LONG m_nModifications).
blob
|
commitdiff
|
diff to current
2008-07-19
Kimmo Varis
Couple of comment improvements.
blob
|
commitdiff
|
diff to current
2008-07-19
Kimmo Varis
PATCH: [ 2021722 ] Add dialog listing available plugins
blob
|
commitdiff
|
diff to current
2008-06-07
Kimmo Varis
PATCH: [ 1985997 ] Remove unnecessary #ifndef around...
blob
|
commitdiff
|
diff to current
2008-05-30
Kimmo Varis
BUG: [ 1602313 ] WinMerge stays in tasklist after closing
blob
|
commitdiff
|
diff to current
2008-02-18
Kimmo Varis
PATCH: [ 1895629 ] Add encoding info (statusbar pane...
blob
|
commitdiff
|
diff to current
2008-02-05
Tim Gerundt
PATCH: [ 1886664 ] Zoom to normal
blob
|
commitdiff
|
diff to current
2008-01-12
Kimmo Varis
PATCH: [ 1869686 ] Add menuitems and shortcut keys...
blob
|
commitdiff
|
diff to current
2008-01-07
Kimmo Varis
PATCH: [ 1865795 ] Re: [ 1832452 ] Horizontal Scrolling...
blob
|
commitdiff
|
diff to current
2007-11-28
Kimmo Varis
PATCH: [ 1837457 ] TouchPad scrolling patches
blob
|
commitdiff
|
diff to current
2007-11-11
Jochen Tucht
Patch #1804762 continued - Fix Bug #1829829
blob
|
commitdiff
|
diff to current
2007-03-30
Gal Hammer
RFE: [ 1690346 ] Manual selection of syntax highlightin...
blob
|
commitdiff
|
diff to current
2007-03-25
Takashi Sawanaka
PATCH: [ 1687430 ] printing patch
blob
|
commitdiff
|
diff to current
2007-02-20
Kimmo Varis
PATCH: [ 1663798 ] Add option and menuitem for file...
blob
|
commitdiff
|
diff to current
2007-01-28
Takashi Sawanaka
PATCH: [ 1640741 ] patch for BUG:[ 1635100 ] Inefficien...
blob
|
commitdiff
|
diff to current
2007-01-10
Gal Hammer
PATCH: [ 1597814 ] 'Wrap Lines' + 'Next Diff' Bug (3)
blob
|
commitdiff
|
diff to current
2007-01-05
Kimmo Varis
PATCH: [ 1628203 ] Reduce options caching in MergeEditView
blob
|
commitdiff
|
diff to current
2006-12-10
Gal Hammer
BUG: [ 1584068 ] location pane is inaccurate when word...
blob
|
commitdiff
|
diff to current
2006-09-15
Kimmo Varis
PATCH: [ 1558913 ] Fix OnTimer prototypes (64-bit compa...
blob
|
commitdiff
|
diff to current
2006-09-04
Takashi Sawanaka
PATCH: [ 1551332 ] defer loading plugin
blob
|
commitdiff
|
diff to current
2006-05-04
Kimmo Varis
PATCH: [ 1481391 ] Make LocationView update from MergeV...
blob
|
commitdiff
|
diff to current
2006-04-29
Takashi Sawanaka
PATCH: [ 1475649 ] Enable selection margin and line...
blob
|
commitdiff
|
diff to current
2006-04-12
Kimmo Varis
PaTCH: [ 1468783 ] Fix disabled scrollbars after loadin...
blob
|
commitdiff
|
diff to current
2006-03-13
Kimmo Varis
PATCH: [ 1447927 ] Add Help Search to menu, open correc...
blob
|
commitdiff
|
diff to current
2006-02-24
Kimmo Varis
PATCH: [ 1437758 ] Improve diff selection when selected...
blob
|
commitdiff
|
diff to current
2006-02-05
Perry Rapp
PATCH: [ 1414201 ] Cleanup Merge Line Flags
blob
|
commitdiff
|
diff to current
2006-02-01
Kimmo Varis
PATCH: [ 1419329 ] Select Line Difference
blob
|
commitdiff
|
diff to current
2006-01-23
Kimmo Varis
PATCH: [ 1411727 ] Merge inactive diff when cursor...
blob
|
commitdiff
|
diff to current
2006-01-20
Kimmo Varis
BUG: [ 1408587 ] Unused DoScroll() function in Merge...
blob
|
commitdiff
|
diff to current
2005-12-30
Perry Rapp
PATCH: [ 1390454 ] new commandline arguments (prediffe...
blob
|
commitdiff
|
diff to current
2005-12-17
Kimmo Varis
PaTCH: [ 1382966 ] Remove empty CMergeEditView::AddMod...
blob
|
commitdiff
|
diff to current
2005-12-08
Takashi Sawanaka
PATCH: [ 1372716 ] patch for RFE:[ 922992 ] Word Wrap...
blob
|
commitdiff
|
diff to current
2005-11-28
Kimmo Varis
PATCH: [ 1265295 ] Swap file compare panes (use pointer...
blob
|
commitdiff
|
diff to current
2005-10-23
Perry Rapp
PATCH: [ 1334484 ] Skip location view paint if buffer...
blob
|
commitdiff
|
diff to current
2005-10-12
Kimmo Varis
PATCH: [ 1286629 ] print support
blob
|
commitdiff
|
diff to current
2005-08-12
Kimmo Varis
PATCH: [ 1253326 ] Allow opening files to external...
blob
|
commitdiff
|
diff to current
2005-08-07
Perry Rapp
PATCH: [ 1248259 ] Preserve trivial diffs in diff...
blob
|
commitdiff
|
diff to current
2005-07-22
Perry Rapp
BUG: [ 1241990 ] Typo in MergeDoc.h: additionnal ...
blob
|
commitdiff
|
diff to current
2005-04-08
Kimmo Varis
PATCH: [ 1178885 ] Merge diffs inside selection (with...
blob
|
commitdiff
|
diff to current
2005-03-04
Kimmo Varis
PATCH: [ 1147039 ] experimental patch for colored word...
blob
|
commitdiff
|
diff to current
2005-02-02
Kimmo Varis
BUG: [ 1039592 ] No differences shown after changing...
blob
|
commitdiff
|
diff to current
2005-01-27
Kimmo Varis
PATCH: [ 946600 ] Copy lines with linenumbers
blob
|
commitdiff
|
diff to current
2005-01-20
Kimmo Varis
PATCH: [ 1105640 ] Properly update locationpane visible...
blob
|
commitdiff
|
diff to current
2005-01-03
Kimmo Varis
PATCH: [ 1094474 ] Visible area indicator for location...
blob
|
commitdiff
|
diff to current
2005-01-02
Kimmo Varis
PATCH: [ 1088049 ] Ask about saving when Window/Close...
blob
|
commitdiff
|
diff to current
2004-10-22
Perry Rapp
PATCH: [ 966908 ] find byte difference in line
blob
|
commitdiff
|
diff to current
2004-07-30
Kimmo Varis
PATCH: [ 1000308 ] Add GotoLine() to CMergeEditView...
blob
|
commitdiff
|
diff to current
2004-06-09
Kimmo Varis
PATCH: [ 969277 ] Color options for moved blocks
blob
|
commitdiff
|
diff to current
2004-06-07
Kimmo Varis
PATCH: [ 967700 ] Add Goto-items to location pane conte...
blob
|
commitdiff
|
diff to current
2004-05-03
Kimmo Varis
PATCH: [ 942565 ] Option for closing windows with ESC
blob
|
commitdiff
|
diff to current
2004-04-21
Kimmo Varis
PATCH: [ 938609 ] Merge mode (simplified)
blob
|
commitdiff
|
diff to current
2004-04-20
Laurent Ganier
PATCH: [ 929210 ] GUI for prediffer (compare two files)
blob
|
commitdiff
|
diff to current
2004-04-17
Kimmo Varis
PATCH: [ 910557 ] Location Bar -submitted by Vincent...
blob
|
commitdiff
|
diff to current
2004-03-27
Laurent Ganier
[ 921788 ] scripts submenu in the main menu
blob
|
commitdiff
|
diff to current
2004-03-19
Perry Rapp
PATCH: [ 891498 ] moved block detection
blob
|
commitdiff
|
diff to current
2004-03-11
Kimmo Varis
PATCH: [ 913792 ] Cache color options for MergeView
blob
|
commitdiff
|
diff to current
2004-01-23
Perry Rapp
PATCH: [ 802113 ] strip out spurious tests: _MSC_VER...
blob
|
commitdiff
|
diff to current
2004-01-19
Kimmo Varis
PATCH: 876875 Go To -Dialog - Fix crash in GotoDlg...
blob
|
commitdiff
|
diff to current
2004-01-19
Perry Rapp
PATCH: [ 847121 ] Code cleanup (remove unneeded AssertV...
blob
|
commitdiff
|
diff to current
2004-01-18
Kimmo Varis
PATCH: 876875 Go To -Dialog
blob
|
commitdiff
|
diff to current
2003-12-18
Kimmo Varis
PATCH: [ 860988 ] Change File from menu (Adds Window...
blob
|
commitdiff
|
diff to current
2003-10-28
Kimmo Varis
PATCH: [ 830553 ] Finetune scroll to diff
blob
|
commitdiff
|
diff to current
next
OSDN Git Service
