OSDN Git Service

(root) / winmerge-jp / winmerge-jp.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: bfc6468 34fc74a)
Merge with stable
authorsdottaka <sdottaka@users.sourceforge.net>
Sun, 19 Jul 2015 13:17:44 +0000 (22:17 +0900)
committersdottaka <sdottaka@users.sourceforge.net>
Sun, 19 Jul 2015 13:17:44 +0000 (22:17 +0900)
commit5540cc676ba39316448b509c40055f1c38481b81
treeecda130cfe55241ea55a8a9e6ef5c06863c91cbetree | snapshot
parentbfc6468e7230ba7715b2899b09580d528ef6f9e8commit | diff
parent34fc74a91690d25f7c6396255d742f44c8c9f80fcommit | diff
Merge with stable
14 files changed:
Src/DirDoc.cpp diff1 | diff2 | blob | history
Src/DirView.cpp diff1 | diff2 | blob | history
Src/ImgMergeFrm.cpp diff1 | diff2 | blob | history
Src/MainFrm.cpp diff1 | diff2 | blob | history
Src/Merge.cpp diff1 | diff2 | blob | history
Src/Merge.h diff1 | diff2 | blob | history
Src/Merge.vcxproj diff1 | diff2 | blob | history
Src/Merge.vcxproj.filters diff1 | diff2 | blob | history
Src/MergeDoc.cpp diff1 | diff2 | blob | history
Src/MergeEditView.cpp diff1 | diff2 | blob | history
Src/OptionsInit.cpp diff1 | diff2 | blob | history
Src/PropRegistry.cpp diff1 | diff2 | blob | history
Src/PropTextColors.cpp diff1 | diff2 | blob | history
Src/SourceControl.h diff1 | diff2 | blob | history
About OSDN
Find Software
Develop Software
Help