Merge pull request #2069 from asmorkalov:android_ocl_1_1_fix
authorAndrey Pavlenko <andrey.pavlenko@itseez.com>
Thu, 26 Dec 2013 19:07:24 +0000 (23:07 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Thu, 26 Dec 2013 19:07:25 +0000 (23:07 +0400)
commit41fd711ab0c41a23a6e2bbc0a8e13e94177067a6
treee80a540dd87b417030479d241b0f7acc8c09c056
parent4b885e20677191ac6c285cf0220c8a5a9c544326
parent4f6f6e8cacfec0cfac430a63a41a4ed62ee70492
Merge pull request #2069 from asmorkalov:android_ocl_1_1_fix