Merge cuda-geek/soft-cascade-gpu into cuda-dev
authormarina.kolpakova <marina.kolpakova@itseez.com>
Mon, 26 Nov 2012 14:57:47 +0000 (18:57 +0400)
committermarina.kolpakova <marina.kolpakova@itseez.com>
Mon, 26 Nov 2012 15:15:02 +0000 (19:15 +0400)
commit209f16455d3b657c59ae2b8c16aeb903014518d0
tree64ba0b68705ebd816fb0822838c90549ba0321d7
parent1712d0930c1bda04df84f81563f196e8fd138ac5
parent05cd88ae4233824a31072e1ed692ba80604ff51f
Merge cuda-geek/soft-cascade-gpu into cuda-dev
modules/gpu/include/opencv2/gpu/gpu.hpp