Merge branch 2.4 into perf_verify_sanity
authorAndrey Kamaev <andrey.kamaev@itseez.com>
Wed, 12 Dec 2012 15:47:12 +0000 (19:47 +0400)
committerAndrey Kamaev <andrey.kamaev@itseez.com>
Wed, 12 Dec 2012 16:14:25 +0000 (20:14 +0400)
1  2 
modules/ts/src/ts_perf.cpp

Simple merge