Merge pull request #11406 from alalek:core_matsize_dims

author Alexander Alekhin <alexander.a.alekhin@gmail.com>

Sat, 28 Apr 2018 14:38:42 +0000 (14:38 +0000)

committer Alexander Alekhin <alexander.a.alekhin@gmail.com>

Sat, 28 Apr 2018 14:38:42 +0000 (14:38 +0000)
author Alexander Alekhin <alexander.a.alekhin@gmail.com>
Sat, 28 Apr 2018 14:38:42 +0000 (14:38 +0000)
committer Alexander Alekhin <alexander.a.alekhin@gmail.com>
Sat, 28 Apr 2018 14:38:42 +0000 (14:38 +0000)
diff --cc modules/core/include/opencv2/core/mat.hpp
Simple merge
diff --cc modules/core/include/opencv2/core/mat.inl.hpp
Simple merge
author	Alexander Alekhin <alexander.a.alekhin@gmail.com>
	Sat, 28 Apr 2018 14:38:42 +0000 (14:38 +0000)
committer	Alexander Alekhin <alexander.a.alekhin@gmail.com>
	Sat, 28 Apr 2018 14:38:42 +0000 (14:38 +0000)
		1	2
modules/core/include/opencv2/core/mat.hpp	patch \|	diff1 \|	diff2 \|	blob \| history
modules/core/include/opencv2/core/mat.inl.hpp	patch \|	diff1 \|	diff2 \|	blob \| history