Merge pull request #2166 from ilya-lavrenov:tapi_gftt
authorAndrey Pavlenko <andrey.pavlenko@itseez.com>
Tue, 21 Jan 2014 18:29:41 +0000 (22:29 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Tue, 21 Jan 2014 18:29:41 +0000 (22:29 +0400)
commit99942e80433f768ff0778eb60a1e3b8834c0dbdb
treeba629cddc5269e25cc3163614ccbbd21d250db00
parentc8afe7efc63b4b1da4b075123867cb6ff820309b
parentbfa382cf9d6126759990ba0688b9ef2998280cac
Merge pull request #2166 from ilya-lavrenov:tapi_gftt
modules/core/src/stat.cpp
modules/ts/include/opencv2/ts/ts_perf.hpp