Merge tag '3.0-ocl-tp2' (-s ours)
authorRoman Donchenko <roman.donchenko@itseez.com>
Wed, 5 Feb 2014 10:00:20 +0000 (14:00 +0400)
committerRoman Donchenko <roman.donchenko@itseez.com>
Wed, 5 Feb 2014 10:00:20 +0000 (14:00 +0400)
OpenCV 3.0 OpenCL Technical Preview 2


Trivial merge