Merge pull request #2551 from ilya-lavrenov:ocl_nonfree
authorAndrey Pavlenko <andrey.pavlenko@itseez.com>
Mon, 31 Mar 2014 17:21:27 +0000 (21:21 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Mon, 31 Mar 2014 17:21:27 +0000 (21:21 +0400)
commit97eac3f3945380e76d20652dcfeca7d8ff4b9e38
tree0009f85f117b925384a3fd4c0375e791a9dbb90b
parentbb3c0c066c3f5d12b79c153cfc08ee57587a76fa
parent7df92bbb77c2b213e9fd634246450bfcc5b78f11
Merge pull request #2551 from ilya-lavrenov:ocl_nonfree