Merge pull request #1866 from ilya-lavrenov:ocl_fix2
authorAndrey Pavlenko <andrey.pavlenko@itseez.com>
Tue, 26 Nov 2013 19:27:48 +0000 (23:27 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Tue, 26 Nov 2013 19:27:49 +0000 (23:27 +0400)
1  2 
modules/core/src/ocl.cpp

Simple merge