Merge with stable

author sdottaka <sdottaka@sourceforge.net>

Sun, 5 Oct 2014 12:20:21 +0000 (21:20 +0900)

committer sdottaka <sdottaka@sourceforge.net>

Sun, 5 Oct 2014 12:20:21 +0000 (21:20 +0900)
author sdottaka <sdottaka@sourceforge.net>
Sun, 5 Oct 2014 12:20:21 +0000 (21:20 +0900)
committer sdottaka <sdottaka@sourceforge.net>
Sun, 5 Oct 2014 12:20:21 +0000 (21:20 +0900)
diff --cc Src/ChildFrm.cpp
Simple merge
diff --cc Src/DirFrame.cpp
Simple merge
diff --cc Src/HexMergeFrm.cpp
Simple merge
diff --cc Src/ImgMergeFrm.cpp
Simple merge
author	sdottaka <sdottaka@sourceforge.net>
	Sun, 5 Oct 2014 12:20:21 +0000 (21:20 +0900)
committer	sdottaka <sdottaka@sourceforge.net>
	Sun, 5 Oct 2014 12:20:21 +0000 (21:20 +0900)
		1	2
Src/ChildFrm.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
Src/DirFrame.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
Src/HexMergeFrm.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
Src/ImgMergeFrm.cpp	patch \|	diff1 \|	diff2 \|	blob \| history