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.cpp
2015-02-20
sdottaka
Merge with stable
blob
|
commitdiff
2015-02-18
sdottaka
- Replace include guards with #pragma once like winmerg...
blob
|
commitdiff
|
diff to current
2015-02-18
sdottaka
Merge with stable
blob
|
commitdiff
|
diff to current
2015-02-17
sdottaka
Merge with stable
blob
|
commitdiff
|
diff to current
2015-02-15
sdottaka
Merge with stable
blob
|
commitdiff
|
diff to current
2015-02-13
sdottaka
Merge with stable
blob
|
commitdiff
|
diff to current
2015-02-09
sdottaka
Merge with stable
blob
|
commitdiff
|
diff to current
2015-01-25
sdottaka
Merge with stable
blob
|
commitdiff
|
diff to current
2015-01-22
sdottaka
Merge with stable
blob
|
commitdiff
|
diff to current
2015-01-16
sdottaka
Merge with stable
blob
|
commitdiff
|
diff to current
2014-12-29
sdottaka
Merge with stable
blob
|
commitdiff
|
diff to current
2014-12-20
sdottaka
Merge with stable
blob
|
commitdiff
|
diff to current
2014-11-29
sdottaka
Merge with stable
blob
|
commitdiff
|
diff to current
2014-11-29
sdottaka
Merge with stable
blob
|
commitdiff
|
diff to current
2014-11-27
sdottaka
Merge with stable
blob
|
commitdiff
|
diff to current
2014-11-27
sdottaka
Merge with stable
blob
|
commitdiff
|
diff to current
2014-11-11
sdottaka
Merge with stable
blob
|
commitdiff
|
diff to current
2014-11-11
sdottaka
Merge with stable
blob
|
commitdiff
|
diff to current
2014-10-30
sdottaka
Merge with stable
blob
|
commitdiff
|
diff to current
2014-10-27
sdottaka
Merge with stable
blob
|
commitdiff
|
diff to current
2014-10-21
sdottaka
Merge with stable
blob
|
commitdiff
|
diff to current
2014-10-05
sdottaka
Merge with stable
blob
|
commitdiff
|
diff to current
2014-10-02
sdottaka
Merge with stable
blob
|
commitdiff
|
diff to current
2014-10-02
sdottaka
Constify some methods
blob
|
commitdiff
|
diff to current
2014-10-02
sdottaka
Merge with stable
blob
|
commitdiff
|
diff to current
2014-09-22
sdottaka
Move Merge Mode code in (MergeDoc.*, MergeEditView...
blob
|
commitdiff
|
diff to current
2014-09-11
sdottaka
Merge with stable
blob
|
commitdiff
|
diff to current
2014-09-02
sdottaka
Merge with stable
blob
|
commitdiff
|
diff to current
2014-07-29
sdottaka
Merge with stable
blob
|
commitdiff
|
diff to current
2014-06-29
sdottaka
Merge with stable
blob
|
commitdiff
|
diff to current
2014-06-07
sdottaka
Merge with stable
blob
|
commitdiff
|
diff to current
2014-05-24
sdottaka
Enable syntax highlight in word diff text blocks.
blob
|
commitdiff
|
diff to current
2014-05-06
sdottaka
Merge with stable
blob
|
commitdiff
|
diff to current
2014-05-03
sdottaka
Merge with stable
blob
|
commitdiff
|
diff to current
2014-03-29
sdottaka
Merge with stable
blob
|
commitdiff
|
diff to current
2014-02-23
sdottaka
Merge with stable
blob
|
commitdiff
|
diff to current
2014-02-23
sdottaka
Remove some warnings
blob
|
commitdiff
|
diff to current
2014-02-16
sdottaka
Merge with stable
blob
|
commitdiff
|
diff to current
2014-02-09
sdottaka
Merge with stable
blob
|
commitdiff
|
diff to current
2014-01-28
sdottaka
Merge with stable
blob
|
commitdiff
|
diff to current
2014-01-25
sdottaka
Merge with stable
blob
|
commitdiff
|
diff to current
2014-01-23
sdottaka
3way-diff: Don't highlight the word diff in right pane...
blob
|
commitdiff
|
diff to current
2014-01-20
sdottaka
Merge with stable
blob
|
commitdiff
|
diff to current
2014-01-19
sdottaka
Add Shift+F4 shortcut key for selecting previous word...
blob
|
commitdiff
|
diff to current
2014-01-18
sdottaka
* Remove "Copy Left to Middle(Alt+4)" and "Copy Right...
blob
|
commitdiff
|
diff to current
2014-01-18
sdottaka
Merge with stable
blob
|
commitdiff
|
diff to current
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-09-09
sdottaka
Fix unsynchronized header bar and editor panes while...
blob
|
commitdiff
|
diff to current
2013-08-31
sdottaka
Add string_to_str()
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-08-18
sdottaka
Delete unnecessary CMergeEditView::OnPluginsList()
blob
|
commitdiff
|
diff to current
2013-07-23
sdottaka
Merge with stable
blob
|
commitdiff
|
diff to current
2013-10-20
sdottaka
Add synchronization points UI like meld(meldmerge.org)
blob
|
commitdiff
|
diff to current
2013-07-14
sdottaka
Merge r8138
blob
|
commitdiff
|
diff to current
2013-07-14
sdottaka
Merge r8129
blob
|
commitdiff
|
diff to current
2013-07-14
sdottaka
Merge r8128
blob
|
commitdiff
|
diff to current
2013-07-07
sdottaka
Merge with rev.8128
blob
|
commitdiff
|
diff to current
2013-07-07
sdottaka
Merge with rev.8123
blob
|
commitdiff
|
diff to current
2013-07-07
sdottaka
Add string_stoi() function similar to C++11 std::stoi()
blob
|
commitdiff
|
diff to current
2013-07-06
sdottaka
* Replace CString with String
blob
|
commitdiff
|
diff to current
2013-06-28
sdottaka
Merge
blob
|
commitdiff
|
diff to current
2013-06-23
sdottaka
Merge
blob
|
commitdiff
|
diff to current
2013-06-23
sdottaka
Merge rev.8105
blob
|
commitdiff
|
diff to current
2013-06-17
sdottaka
Use _() macro instead of LoadString() (2)
blob
|
commitdiff
|
diff to current
2013-06-15
sdottaka
Merge rev. 8098-8100
blob
|
commitdiff
|
diff to current
2013-06-10
sdottaka
* Use _() macro instead of LoadString()
blob
|
commitdiff
|
diff to current
2013-05-13
sdottaka
Move loading/saving diff color settings code to Options...
blob
|
commitdiff
|
diff to current
2013-05-12
sdottaka
* Remove "View/Select Font" menu item. close #19
blob
|
commitdiff
|
diff to current
2013-05-04
sdottaka
Avoid using 'delete' operator
blob
|
commitdiff
|
diff to current
2013-04-13
sdottaka
Change the behavior when specifying '-e' command line...
blob
|
commitdiff
|
diff to current
2013-02-18
sdottaka
Compare words per line if diff block lines > 20 (for...
2.14.0+-jp-2
blob
|
commitdiff
|
diff to current
2012-11-04
sdottaka
- Remove MFC dependency
blob
|
commitdiff
|
diff to current
2012-03-25
sdottaka
Didn't ask whether to close multiple windows when start...
blob
|
commitdiff
|
diff to current
2011-12-17
sdottaka
Replace BOOL with bool
blob
|
commitdiff
|
diff to current
2011-08-07
sdottaka
learning about boost::scoped_* ...
blob
|
commitdiff
|
diff to current
2011-08-07
sdottaka
fix no-redraw problem when resizing the second and...
blob
|
commitdiff
|
diff to current
2011-07-03
sdottaka
Modal Open Dialog considered harmful.
2.13.20+-jp-4
blob
|
commitdiff
|
diff to current
2011-06-26
sdottaka
Prevent from showing inline-diff at moved block line.
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-04
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-04-26
sdottaka
Added 'Split Vertically' menu item
blob
|
commitdiff
|
diff to current
next
OSDN Git Service
