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
/
Merge.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-12
sdottaka
Merge with stable
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-07-23
sdottaka
Merge with stable
blob
|
commitdiff
|
diff to current
2013-07-14
sdottaka
Merge r8138
blob
|
commitdiff
|
diff to current
2013-07-14
sdottaka
Merge r8128
blob
|
commitdiff
|
diff to current
2013-07-07
sdottaka
Merge with rev.8123
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-15
sdottaka
Merge rev. 8098-8100
blob
|
commitdiff
|
diff to current
2013-06-02
sdottaka
Add GNU gettext-like API
blob
|
commitdiff
|
diff to current
2013-05-26
sdottaka
Remove LogFile.*
blob
|
commitdiff
|
diff to current
2012-11-04
sdottaka
- Remove MFC dependency
blob
|
commitdiff
|
diff to current
2012-09-02
sdottaka
Use Poco::XML library instead of SCEW and Expat libraries
blob
|
commitdiff
|
diff to current
2011-08-07
sdottaka
learning about boost::scoped_* ...
blob
|
commitdiff
|
diff to current
2011-07-03
sdottaka
Modal Open Dialog considered harmful.
blob
|
commitdiff
|
diff to current
2008-08-29
Jochen Tucht
Patch #2081779 - Revised command line processing
blob
|
commitdiff
|
diff to current
2008-08-12
Kimmo Varis
PATCH: [ 2046002 ] Fix losing focus after folder compar...
blob
|
commitdiff
|
diff to current
2008-08-09
Jochen Tucht
Patch #2036603
blob
|
commitdiff
|
diff to current
2008-06-16
Kimmo Varis
Split CRegOptions from OptionsMgr.h/cpp to own cpp...
blob
|
commitdiff
|
diff to current
2007-11-03
Jochen Tucht
Patch #1804762 continued
blob
|
commitdiff
|
diff to current
2007-10-14
Jochen Tucht
Patch #1804762 continued
blob
|
commitdiff
|
diff to current
2007-10-06
Jochen Tucht
Patch #1804762 continued
blob
|
commitdiff
|
diff to current
2007-10-05
Jochen Tucht
(no commit message)
blob
|
commitdiff
|
diff to current
2007-06-26
Kimmo Varis
BUG: [ 1739998 ] No copy/move/delete icons in compare...
blob
|
commitdiff
|
diff to current
2007-06-05
Dean Grimm
PATCH: [ 1731551 ] Recent Projects MRU
blob
|
commitdiff
|
diff to current
2007-05-30
Kimmo Varis
PATCH: [ 1727722 ] Remove AppSerialize (only used for...
blob
|
commitdiff
|
diff to current
2007-03-13
Kimmo Varis
PATCH: [ 1679196 ] Cleanup logfile class usage
blob
|
commitdiff
|
diff to current
2007-02-19
Kimmo Varis
PATCH: [ 1642876 ] Open manual for command line help
blob
|
commitdiff
|
diff to current
2007-01-10
Kimmo Varis
PATCH: [ 1631806 ] Fix Filterspath initialization
blob
|
commitdiff
|
diff to current
2007-01-04
Kimmo Varis
PATCH: [ 1625344 ] Move OptionsMgr from MainFrame to...
blob
|
commitdiff
|
diff to current
2006-11-25
Kimmo Varis
PATCH: [ 1602365 ] Move SelectFile and SelectFolder...
blob
|
commitdiff
|
diff to current
2006-11-22
Kimmo Varis
PATCH: [ 1600714 ] Allow canceling when started from...
blob
|
commitdiff
|
diff to current
2006-11-17
Gal Hammer
PATCH: [ 1598194 ] New command line parser
blob
|
commitdiff
|
diff to current
2006-10-30
Kimmo Varis
PATCH: [ 1586869 ] Fix File Select -dialog modality
blob
|
commitdiff
|
diff to current
2006-03-06
Perry Rapp
PATCH: [ 1435361 ] Fix and cleanup project file code
blob
|
commitdiff
|
diff to current
2006-03-01
Kimmo Varis
PATCH: [ 1395847 ] Integration with Rational ClearCase
blob
|
commitdiff
|
diff to current
2006-02-20
Kimmo Varis
PATCH: [ 1178743 ] Disable lang menu if no additional...
blob
|
commitdiff
|
diff to current
2006-01-30
Perry Rapp
PATCH: [ 1415895 ] Split cmdline help string into chunks
blob
|
commitdiff
|
diff to current
2006-01-22
Perry Rapp
2006-01-22 Perry
blob
|
commitdiff
|
diff to current
2005-12-30
Perry Rapp
PATCH: [ 1390454 ] new commandline arguments (prediffe...
blob
|
commitdiff
|
diff to current
2005-11-02
Kimmo Varis
PATCH: [ 1342550 ] Modernize file selection dialog
blob
|
commitdiff
|
diff to current
2005-07-25
Perry Rapp
PATCH: [ 1244808 ] Remove LanguageSelect include from...
blob
|
commitdiff
|
diff to current
2005-06-08
Perry Rapp
2005-06-08 Perry
blob
|
commitdiff
|
diff to current
2005-06-02
Perry Rapp
2005-06-02 Perry
blob
|
commitdiff
|
diff to current
2005-04-22
Kimmo Varis
PATCH: [ 1184626 ] Allow only single instance to run...
blob
|
commitdiff
|
diff to current
2005-03-04
Perry Rapp
2005-03-04 Perry
blob
|
commitdiff
|
diff to current
2004-08-04
Kimmo Varis
PATCH: [ 1000020 ] Simple project files (no GUI)
blob
|
commitdiff
|
diff to current
2004-07-16
Kimmo Varis
PATCH: [ 990976 ] FileFilterHelper (filter code cleanup)
blob
|
commitdiff
|
diff to current
2004-07-01
Kimmo Varis
PATCH: [ 982703 ] Open manual when user presses F1
blob
|
commitdiff
|
diff to current
2004-05-24
Kimmo Varis
PATCH: [ 958938 ] Better way to close WinMerge with...
blob
|
commitdiff
|
diff to current
2004-05-14
Kimmo Varis
PATCH: [ 948592 ] Open and select filefilter from Open...
blob
|
commitdiff
|
diff to current
2004-03-09
Kimmo Varis
PATCH: [ 912297 ] Splashscreen and syntax highlight...
blob
|
commitdiff
|
diff to current
2004-03-02
Kimmo Varis
PATCH: [ 907641 ] Convert color options to new system
blob
|
commitdiff
|
diff to current
2004-03-01
Kimmo Varis
PATCH: [ 906180 ] Use SHBrowseForFolder() to select...
blob
|
commitdiff
|
diff to current
2004-01-19
Perry Rapp
PATCH: [ 847121 ] Code cleanup (remove unneeded AssertV...
blob
|
commitdiff
|
diff to current
2004-01-17
Kimmo Varis
PATCH: [ 871789 ] Add "Copy to..." items to dirview...
blob
|
commitdiff
|
diff to current
2004-01-09
Perry Rapp
PATCH: [ 862040 ] CAssureScriptsForThread like WaitCursor
blob
|
commitdiff
|
diff to current
2003-10-17
Laurent Ganier
[ 807263 ] Preprocessing patch
blob
|
commitdiff
|
diff to current
2003-10-08
Laurent Ganier
[ 818198 ] Colors for "ignore blank lines"
blob
|
commitdiff
|
diff to current
2003-10-04
Laurent Ganier
Undo last changes related to PATCH: [ 813794 ] Fix...
blob
|
commitdiff
|
diff to current
2003-10-04
Perry Rapp
Restore trivial colors originally included in PATCH...
blob
|
commitdiff
|
diff to current
2003-10-03
Perry Rapp
PATCH: [ 813794 ] Fix "ignore blank lines"
blob
|
commitdiff
|
diff to current
2003-10-02
Kimmo Varis
PATCH: [ 815138 ] Commandline filedescriptors
blob
|
commitdiff
|
diff to current
2003-09-26
Perry Rapp
PATCH: [ 811039 ] Identify filters by path to solve...
blob
|
commitdiff
|
diff to current
2003-09-06
Kimmo Varis
PATCH: [ 793900 ] Editable file filters - submitted...
blob
|
commitdiff
|
diff to current
2003-07-16
Kimmo Varis
PATCH: [ 768740 ] Additional color options - Submitted...
blob
|
commitdiff
|
diff to current
2003-05-18
Perry Rapp
[ 739529 ] project file & directory filters
blob
|
commitdiff
|
diff to current
2003-03-23
Perry Rapp
PATCH: [ 706006 ] Suppress Rescan during Merge
blob
|
commitdiff
|
diff to current
2003-02-21
Perry Rapp
[ 690176 ] Cmdline param for ESC closing
blob
|
commitdiff
|
diff to current
2003-02-09
Perry Rapp
[ 683120 ] splitfilename changed to CStrings
blob
|
commitdiff
|
diff to current
2002-09-06
Chris Mumford
Added a hight color selection property page
blob
|
commitdiff
|
diff to current
2001-11-11
Dennis Lim
cleanup codes.
blob
|
commitdiff
|
diff to current
2001-06-20
Dennis Lim
Option to disable Splash Screen
blob
|
commitdiff
|
diff to current
2001-05-23
Dennis Lim
Fix ASSERT bug for OleInit
blob
|
commitdiff
|
diff to current
2000-10-27
grimmd
Initial revision
blob
|
commitdiff
|
diff to current
OSDN Git Service
