Merge tag '3.0-ocl-tech-preview' (-s ours)
authorRoman Donchenko <roman.donchenko@itseez.com>
Thu, 9 Jan 2014 08:42:58 +0000 (12:42 +0400)
committerRoman Donchenko <roman.donchenko@itseez.com>
Thu, 9 Jan 2014 08:42:58 +0000 (12:42 +0400)
commitcab67cd9ac7b0680d49d1b26c08c779b3118a9f6
tree3d2ba03ae56007e50b5c210d846daa5f5941d1bd
parent6d84671e8b5e402b3b2418e6e8fb98a3db447107
parent984c4d200f57c0a23ca269e7646c5ad8e6d44722
Merge tag '3.0-ocl-tech-preview' (-s ours)