Merge pull request #2000 from apavlenko:license_copyright
authorAndrey Pavlenko <andrey.pavlenko@itseez.com>
Wed, 18 Dec 2013 15:35:04 +0000 (19:35 +0400)
committerOpenCV Buildbot <buildbot@opencv.org>
Wed, 18 Dec 2013 15:35:04 +0000 (19:35 +0400)
commit2431c72d1debf04728f49ab499765344f3adb4f0
tree95c9b19dc274115319f21307de9837828e50234d
parent59cab94fc7a43ad3a39414232fd34d23815b8547
parent96f8ff2ab8d37f362f90e10d05e3c6039c51e92b
Merge pull request #2000 from apavlenko:license_copyright
modules/ocl/include/opencv2/ocl.hpp