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

OSDN Git Service

(root) / winmerge-jp / winmerge-jp.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 056b6c3 fb17af1)

author	sdottaka <none@none>
	Mon, 18 Nov 2013 13:42:18 +0000 (22:42 +0900)
committer	sdottaka <none@none>
	Mon, 18 Nov 2013 13:42:18 +0000 (22:42 +0900)
commit	347f2119254d890cb1f55f5ad849cb3dc405baf7
tree	087a1ffa26db4a5a9ee7118813e0c641a397eca6	tree \| snapshot
parent	056b6c35e3bf3b59f62f967e0edf903c5580617f	commit \| diff
parent	fb17af18daf3d5fb851dc0044e3024009eb06a64	commit \| diff

Merge with stable

Src/Common/MDITabBar.cpp	diff1 \|	diff2 \|	blob \| history
Src/DiffWrapper.cpp	diff1 \|	diff2 \|	blob \| history
Src/DirDoc.cpp	diff1 \|	diff2 \|	blob \| history
Src/DirDoc.h	diff1 \|	diff2 \|	blob \| history
Src/DirFrame.cpp	diff1 \|	diff2 \|	blob \| history
Src/Merge.vcxproj.filters	diff1 \|	diff2 \|	blob \| history
Src/MergeDoc.cpp	diff1 \|	diff2 \|	blob \| history
Translations/WinMerge/English.pot	diff1 \|	diff2 \|	blob \| history

About OSDN

Find Software

Develop Software

Help

Copyright ©OSDN Corporation All rights reserved.