Merge branch 'master' into cuda-dev
authorVladislav Vinogradov <vlad.vinogradov@itseez.com>
Mon, 24 Dec 2012 09:48:33 +0000 (13:48 +0400)
committerVladislav Vinogradov <vlad.vinogradov@itseez.com>
Mon, 24 Dec 2012 09:48:33 +0000 (13:48 +0400)
commit5138b7d2097328293c3627b838ab39ff0f784548
tree5b9a58a9633c500fb8f7c5ef172748abc5c1fadc
parent4db68b50f289abb0de9eca0bf99c1ea9b3bffbeb
parentc02179a7659798453a0b15b2ccfbf4aa6cf0d7f4
Merge branch 'master' into cuda-dev
CMakeLists.txt
modules/core/include/opencv2/core/core.hpp
modules/ts/src/ts_perf.cpp