Merge with stable

author sdottaka <sdottaka@sourceforge.net>

Sun, 9 Feb 2014 07:31:01 +0000 (16:31 +0900)

committer sdottaka <sdottaka@sourceforge.net>

Sun, 9 Feb 2014 07:31:01 +0000 (16:31 +0900)
author sdottaka <sdottaka@sourceforge.net>
Sun, 9 Feb 2014 07:31:01 +0000 (16:31 +0900)
committer sdottaka <sdottaka@sourceforge.net>
Sun, 9 Feb 2014 07:31:01 +0000 (16:31 +0900)
diff --cc Src/LoadSaveCodepageDlg.cpp
Simple merge
diff --cc Src/MergeDoc.cpp
Simple merge
diff --cc Src/OpenView.cpp
Simple merge
author	sdottaka <sdottaka@sourceforge.net>
	Sun, 9 Feb 2014 07:31:01 +0000 (16:31 +0900)
committer	sdottaka <sdottaka@sourceforge.net>
	Sun, 9 Feb 2014 07:31:01 +0000 (16:31 +0900)
		1	2
Src/LoadSaveCodepageDlg.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
Src/MergeDoc.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
Src/OpenView.cpp	patch \|	diff1 \|	diff2 \|	blob \| history