Merge pull request #2230 from ilya-lavrenov:tapi_openc_on-off_game
authorAndrey Pavlenko <andrey.pavlenko@itseez.com>
Sat, 1 Feb 2014 18:32:39 +0000 (22:32 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Sat, 1 Feb 2014 18:32:39 +0000 (22:32 +0400)
1  2 
modules/core/src/ocl.cpp

Simple merge