Merge commit '60906d917' into merge-2.4
authorRoman Donchenko <roman.donchenko@itseez.com>
Mon, 30 Dec 2013 12:47:05 +0000 (16:47 +0400)
committerRoman Donchenko <roman.donchenko@itseez.com>
Mon, 30 Dec 2013 12:47:05 +0000 (16:47 +0400)
commit09e154d2140d332c63214bf049000233a2516976
tree7ef4375bb76513d47daa327a06a3aa4f14df09b6
parent2cdbf6c0b6f260b67be403cfb9c10748c3bd936f
parent60906d9175be2cd465e0fa7ff1e0737a459695b6
Merge commit '60906d917' into merge-2.4

Conflicts:
modules/ts/src/cuda_perf.cpp
modules/ts/CMakeLists.txt
modules/ts/src/cuda_perf.cpp