Merge pull request #2166 from ilya-lavrenov:tapi_gftt

author Andrey Pavlenko <andrey.pavlenko@itseez.com>

Tue, 21 Jan 2014 18:29:41 +0000 (22:29 +0400)

committer OpenCV Buildbot <buildbot@opencv.org>

Tue, 21 Jan 2014 18:29:41 +0000 (22:29 +0400)
author Andrey Pavlenko <andrey.pavlenko@itseez.com>
Tue, 21 Jan 2014 18:29:41 +0000 (22:29 +0400)
committer OpenCV Buildbot <buildbot@opencv.org>
Tue, 21 Jan 2014 18:29:41 +0000 (22:29 +0400)
diff --cc modules/core/src/stat.cpp
Simple merge
diff --cc modules/ts/include/opencv2/ts/ts_perf.hpp
Simple merge
author	Andrey Pavlenko <andrey.pavlenko@itseez.com>
	Tue, 21 Jan 2014 18:29:41 +0000 (22:29 +0400)
committer	OpenCV Buildbot <buildbot@opencv.org>
	Tue, 21 Jan 2014 18:29:41 +0000 (22:29 +0400)
		1	2
modules/core/src/stat.cpp	patch \|	diff1 \|	diff2 \|	blob \| history
modules/ts/include/opencv2/ts/ts_perf.hpp	patch \|	diff1 \|	diff2 \|	blob \| history