Merge pull request #6821 from sturkmen72:TickMeter_class_addition

author Maksim Shabunin <maksim.shabunin@itseez.com>

Thu, 14 Jul 2016 11:40:46 +0000 (11:40 +0000)

committer Maksim Shabunin <maksim.shabunin@itseez.com>

Thu, 14 Jul 2016 11:40:46 +0000 (11:40 +0000)
author Maksim Shabunin <maksim.shabunin@itseez.com>
Thu, 14 Jul 2016 11:40:46 +0000 (11:40 +0000)
committer Maksim Shabunin <maksim.shabunin@itseez.com>
Thu, 14 Jul 2016 11:40:46 +0000 (11:40 +0000)
diff --cc modules/core/include/opencv2/core/utility.hpp
Simple merge
diff --cc samples/gpu/cascadeclassifier.cpp
Simple merge
author	Maksim Shabunin <maksim.shabunin@itseez.com>
	Thu, 14 Jul 2016 11:40:46 +0000 (11:40 +0000)
committer	Maksim Shabunin <maksim.shabunin@itseez.com>
	Thu, 14 Jul 2016 11:40:46 +0000 (11:40 +0000)
		1	2
modules/core/include/opencv2/core/utility.hpp	patch \|	diff1 \|	diff2 \|	blob \| history
samples/gpu/cascadeclassifier.cpp	patch \|	diff1 \|	diff2 \|	blob \| history