Merge pull request #887 from LeszekSwirski:fix-glinkedptrmutex
authorRoman Donchenko <roman.donchenko@itseez.com>
Wed, 22 May 2013 08:57:04 +0000 (12:57 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Wed, 22 May 2013 08:57:04 +0000 (12:57 +0400)
1  2 
modules/ts/include/opencv2/ts.hpp
modules/ts/include/opencv2/ts/ts_perf.hpp

Simple merge