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)
commit817a4c0c300d1201ad5ac9082c75587ccb0ee4f3
tree8e8df26f766b599d3c9c3ba6d4ae9d68d1aeaf99
parent932204d197d2fb60651536bbadbd17980fd15d79
parent64cf113d23045e1f2a63cb1ce5345e82f1128113
Merge branch 2.4 into perf_verify_sanity
modules/ts/src/ts_perf.cpp