Merge branch 2.4
authorAndrey Kamaev <andrey.kamaev@itseez.com>
Fri, 14 Dec 2012 10:46:41 +0000 (14:46 +0400)
committerAndrey Kamaev <andrey.kamaev@itseez.com>
Fri, 14 Dec 2012 10:46:41 +0000 (14:46 +0400)
commitf5cd20d80b7be1a0451787283351959c3032f73a
tree0cdc5fc04e31f448673146e8bee082603878d228
parent464826c232210e9e71d48d8549703b0ec7bd2db1
parent9b09f09b9affe8934d8c1b04eb32ac3a0fbf0b20
Merge branch 2.4
modules/ts/src/ts_perf.cpp