Merge pull request #7373 from tomoaki0705:featureCannyUniversalIntrinsic

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

Tue, 4 Oct 2016 10:52:13 +0000 (10:52 +0000)

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

Tue, 4 Oct 2016 10:52:13 +0000 (10:52 +0000)
author Alexander Alekhin <alexander.a.alekhin@gmail.com>
Tue, 4 Oct 2016 10:52:13 +0000 (10:52 +0000)
committer Alexander Alekhin <alexander.a.alekhin@gmail.com>
Tue, 4 Oct 2016 10:52:13 +0000 (10:52 +0000)
diff --cc modules/core/include/opencv2/core/hal/intrin_neon.hpp
Simple merge
diff --cc modules/core/include/opencv2/core/hal/intrin_sse.hpp
Simple merge
author	Alexander Alekhin <alexander.a.alekhin@gmail.com>
	Tue, 4 Oct 2016 10:52:13 +0000 (10:52 +0000)
committer	Alexander Alekhin <alexander.a.alekhin@gmail.com>
	Tue, 4 Oct 2016 10:52:13 +0000 (10:52 +0000)
		1	2
modules/core/include/opencv2/core/hal/intrin_neon.hpp	patch \|	diff1 \|	diff2 \|	blob \| history
modules/core/include/opencv2/core/hal/intrin_sse.hpp	patch \|	diff1 \|	diff2 \|	blob \| history