Merge with fragmagit/master

author eazimi <azimi.ehsan@outlook.com>

Wed, 20 Jan 2021 17:40:42 +0000 (18:40 +0100)

committer eazimi <azimi.ehsan@outlook.com>

Wed, 20 Jan 2021 17:40:42 +0000 (18:40 +0100)
author eazimi <azimi.ehsan@outlook.com>
Wed, 20 Jan 2021 17:40:42 +0000 (18:40 +0100)
committer eazimi <azimi.ehsan@outlook.com>
Wed, 20 Jan 2021 17:40:42 +0000 (18:40 +0100)
diff --cc MANIFEST.in
Simple merge
diff --cc src/mc/mc_api.cpp
Simple merge
diff --cc src/mc/mc_api.hpp
Simple merge
author	eazimi <azimi.ehsan@outlook.com>
	Wed, 20 Jan 2021 17:40:42 +0000 (18:40 +0100)
committer	eazimi <azimi.ehsan@outlook.com>
	Wed, 20 Jan 2021 17:40:42 +0000 (18:40 +0100)
		1	2
MANIFEST.in	patch \|	diff1 \|	diff2 \|	blob \| history
src/mc/mc_api.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
src/mc/mc_api.hpp	patch \|	diff1 \|	diff2 \|	blob \| history