Merge pull request #1591 from alalek:ocl_remove_cl_hpp_h
authorAndrey Pavlenko <andrey.pavlenko@itseez.com>
Thu, 10 Oct 2013 11:55:12 +0000 (15:55 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Thu, 10 Oct 2013 11:55:13 +0000 (15:55 +0400)
1  2 
modules/ocl/src/cl_context.cpp

Simple merge