Merge remote-tracking branch 'cuda-geek/surf-with-mask-fix' into 2.4
authormarina.kolpakova <marina.kolpakova@itseez.com>
Mon, 22 Oct 2012 09:16:27 +0000 (13:16 +0400)
committermarina.kolpakova <marina.kolpakova@itseez.com>
Mon, 22 Oct 2012 09:16:27 +0000 (13:16 +0400)
commit8e2f729aa7c9e0ecd86c3fa3324a7282e752340e
tree723e8f6ded789081348970c2018ef97a7a5002e2
parent99c666691e3cd47a69219a5e8df14a2c3bac09ab
parentb14f447cc69a3bc75ba727a11e058a7e1774f855
Merge remote-tracking branch 'cuda-geek/surf-with-mask-fix' into 2.4