git.osdn.net Git - winmerge-jp/winmerge-jp.git/commit

author	sdottaka <sdottaka@users.sourceforge.net>
	Sun, 6 Sep 2015 15:14:39 +0000 (00:14 +0900)
committer	sdottaka <sdottaka@users.sourceforge.net>
	Sun, 6 Sep 2015 15:14:39 +0000 (00:14 +0900)
commit	54a87243ffc8f663d3dae14d0958d0bf39c3c185
tree	15b4fbc10f10d81b766e5eb7bc23855c0a55feff	tree \| snapshot
parent	d5a4940f5aba09b6fe51e5144be8a73f7ed8a5dd	commit \| diff

Resume implementing 3-way folder compare

21 files changed:

Src/7zCommon.cpp		diff \| blob \| history
Src/7zCommon.h		diff \| blob \| history
Src/DirActions.cpp		diff \| blob \| history
Src/DirActions.h		diff \| blob \| history
Src/DirItemIterator.h		diff \| blob \| history
Src/DirView.cpp		diff \| blob \| history
Src/DirView.h		diff \| blob \| history
Src/MainFrm.cpp		diff \| blob \| history
Src/Merge.rc		diff \| blob \| history
Src/Merge2.rc		diff \| blob \| history
Src/OptionsDef.h		diff \| blob \| history
Src/OptionsInit.cpp		diff \| blob \| history
Src/res/all.bmp	[new file with mode: 0644]	blob
Src/res/left_to_middle.bmp	[new file with mode: 0644]	blob
Src/res/middle.bmp	[new file with mode: 0644]	blob
Src/res/middle_to_browse.bmp	[new file with mode: 0644]	blob
Src/res/middle_to_left.bmp	[new file with mode: 0644]	blob
Src/res/middle_to_right.bmp	[new file with mode: 0644]	blob
Src/res/move_middle_to_browse.bmp	[new file with mode: 0644]	blob
Src/res/right_to_middle.bmp	[new file with mode: 0644]	blob
Src/resource.h		diff \| blob \| history

About OSDN

Find Software

Develop Software

Help